@farm.js/search 0.1.0-beta.0 → 0.1.0-beta.10

package/dist/build.d.ts

@@ -4,6 +4,8 @@ export interface SearchBuildInput {
     publicDir?: string;
     preset: string;
     basePath: string;
+    /** Prefix already present in emitted HTML paths (localized Farm SSG output). */
+    htmlBasePath?: string;
     options: ResolvedSearchOptions;
 }
 export interface SearchBuildResult {

package/dist/build.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../src/build.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAEzD,MAAM,WAAW,gBAAgB;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,qBAAqB,CAAC;CAChC;AAED,MAAM,WAAW,iBAAiB;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB;AAED,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CA+E1F;AAED,wBAAgB,sBAAsB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAKhF;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAGnE;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAQpE;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAKrE;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAKtD;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAoB3E"}
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../src/build.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAEzD,MAAM,WAAW,gBAAgB;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,gFAAgF;IAChF,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,qBAAqB,CAAC;CAChC;AAED,MAAM,WAAW,iBAAiB;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB;AAED,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAoF1F;AAED,wBAAgB,sBAAsB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAKhF;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAGnE;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAKpE;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAKrE;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAKtD;AAYD,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAwB3E"}

package/dist/build.js

@@ -1,4 +1,4 @@
-import { mkdir, readFile, readdir, rm } from "node:fs/promises";
+import { lstat, mkdir, readFile, readdir, realpath, rm } from "node:fs/promises";
 import path from "node:path";
 import * as pagefind from "pagefind";
 export async function writeSearchIndex(input) {
@@ -6,17 +6,18 @@ export async function writeSearchIndex(input) {
     const basePath = normalizeBasePath(input.basePath);
     const bundlePath = withBasePath(`/${input.options.output}`, basePath);
     const outputPath = resolveOutputPath(publicDir, bundlePath);
+    await assertOutputPathInside(publicDir, outputPath);
     const htmlFiles = await collectHtmlFiles(publicDir, outputPath);
     const routes = htmlFiles
         .map((file) => ({
         file,
-        logicalRoute: stripBasePath(routeFromHtmlFile(path.relative(publicDir, file)), basePath),
+        logicalRoute: stripBasePath(routeFromHtmlFile(path.relative(publicDir, file)), input.htmlBasePath ?? "/"),
     }))
         .sort((left, right) => left.logicalRoute.localeCompare(right.logicalRoute));
     const selected = routes.filter(({ logicalRoute }) => shouldIndexRoute(logicalRoute, input.options));
     const skippedRoutes = routes
         .filter(({ logicalRoute }) => !shouldIndexRoute(logicalRoute, input.options))
-        .map(({ logicalRoute }) => withBasePath(logicalRoute, basePath));
+        .map(({ logicalRoute }) => toResultUrl(logicalRoute, basePath));
     if (selected.length === 0) {
         throw new Error("[farm:search] No static HTML pages matched the configured routes. " +
             "Mark searchable pages as static or update search include/exclude patterns.");
@@ -42,7 +43,7 @@ export async function writeSearchIndex(input) {
     const indexedRoutes = [];
     try {
         for (const { file, logicalRoute } of selected) {
-            const route = withBasePath(logicalRoute, basePath);
+            const route = toResultUrl(logicalRoute, basePath);
             const result = await index.addHTMLFile({
                 url: route,
                 content: await readFile(file, "utf8"),
@@ -52,6 +53,7 @@ export async function writeSearchIndex(input) {
             }
             indexedRoutes.push(route);
         }
+        await assertOutputPathIsOwned(outputPath);
         await rm(outputPath, { recursive: true, force: true });
         await mkdir(path.dirname(outputPath), { recursive: true });
         const written = await index.writeFiles({ outputPath });
@@ -86,9 +88,6 @@ export function withBasePath(route, basePath) {
     const normalizedRoute = route === "/" ? "/" : `/${route.replace(/^\/+|\/+$/g, "")}`;
     if (normalizedBase === "/")
         return normalizedRoute;
-    if (normalizedRoute === normalizedBase || normalizedRoute.startsWith(`${normalizedBase}/`)) {
-        return normalizedRoute;
-    }
     return normalizedRoute === "/" ? normalizedBase : `${normalizedBase}${normalizedRoute}`;
 }
 export function stripBasePath(route, basePath) {
@@ -105,20 +104,31 @@ export function routeFromHtmlFile(file) {
     const route = withoutIndex ? withoutIndex.replace(/\.html$/i, "").replace(/^\/+|\/+$/g, "") : "";
     return route ? `/${route}` : "/";
 }
+function toResultUrl(route, basePath) {
+    // Routes came from decoded filesystem names. Encode each segment once, after
+    // filtering and removing any explicit HTML prefix; basePath is already a URL path.
+    const pathname = route
+        .split("/")
+        .map((segment) => encodeURIComponent(segment))
+        .join("/");
+    return withBasePath(pathname, basePath);
+}
 export function matchesRoutePattern(route, pattern) {
-    if (pattern.endsWith("/**")) {
-        const parent = pattern.slice(0, -3) || "/";
-        return route === parent || route.startsWith(parent === "/" ? "/" : `${parent}/`);
-    }
+    const descendants = pattern.endsWith("/**");
+    const parentPattern = descendants ? pattern.slice(0, -3) : pattern;
     let source = "";
-    for (let index = 0; index < pattern.length; index++) {
-        const character = pattern[index];
-        if (character === "*" && pattern[index + 1] === "*") {
-            source += ".*";
-            index++;
-        }
-        else if (character === "*") {
-            source += "[^/]*";
+    for (let index = 0; index < parentPattern.length; index++) {
+        const character = parentPattern[index];
+        if (character === "*") {
+            // Collapse the whole run. Emitting one `.*` per adjacent pair turned
+            // `****` into `.*.*`, and each extra pair multiplied the ways a failing
+            // route could be split between them, so a pattern with a handful of
+            // consecutive stars hung the build instead of matching.
+            let run = 1;
+            while (parentPattern[index + run] === "*")
+                run++;
+            source += run > 1 ? ".*" : "[^/]*";
+            index += run - 1;
         }
         else if (character === "?") {
             source += "[^/]";
@@ -127,6 +137,9 @@ export function matchesRoutePattern(route, pattern) {
             source += character.replace(/[|\\{}()[\]^$+?.]/g, "\\$&");
         }
     }
+    // Compile the parent too: a terminal /** must not turn earlier wildcards into literals.
+    if (descendants)
+        source += parentPattern ? "(?:/.*)?" : "/.*";
     return new RegExp(`^${source}/?$`).test(route);
 }
 function shouldIndexRoute(route, options) {
@@ -163,11 +176,89 @@ async function collectHtmlFiles(root, ignoredDirectory) {
 function resolveOutputPath(publicDir, bundlePath) {
     const outputPath = path.resolve(publicDir, `.${bundlePath}`);
     const relative = path.relative(publicDir, outputPath);
-    if (!relative || relative.startsWith("..") || path.isAbsolute(relative)) {
+    if (!relative ||
+        relative === ".." ||
+        relative.startsWith(`..${path.sep}`) ||
+        path.isAbsolute(relative)) {
         throw new Error("[farm:search] Search output must stay inside the public output directory");
     }
     return outputPath;
 }
+/**
+ * Refuse to delete prerendered pages that happen to live where the index goes.
+ *
+ * The index directory is wiped before it is rewritten, and it comes from the
+ * `output` option, so `output: "search"` on a site that also prerenders a
+ * `/search` page pointed the wipe at the app's own pages. `collectHtmlFiles`
+ * skips this directory, so those pages were left out of the index and then
+ * deleted from the deploy output, with a success log and a zero exit.
+ *
+ * Only HTML is treated as the app's: a previous bundle leaves non-HTML files
+ * behind, and clearing those is this function's normal job.
+ */
+async function assertOutputPathIsOwned(outputPath) {
+    const pages = await findHtmlFile(outputPath);
+    if (!pages)
+        return;
+    throw new Error(`The search index directory ${outputPath} contains a prerendered page (${path.relative(outputPath, pages)}), ` +
+        `so it will not be replaced. Give \`search({ output })\` a directory of its own, ` +
+        `or move the conflicting route, then build again.`);
+}
+/** The first HTML file at any depth, or undefined when there is none. */
+async function findHtmlFile(directory) {
+    let entries;
+    try {
+        entries = await readdir(directory, { withFileTypes: true });
+    }
+    catch (error) {
+        // Nothing there yet is the ordinary first build.
+        if (error.code === "ENOENT")
+            return undefined;
+        throw error;
+    }
+    for (const entry of entries) {
+        const entryPath = path.join(directory, entry.name);
+        if (entry.isDirectory()) {
+            const nested = await findHtmlFile(entryPath);
+            if (nested)
+                return nested;
+        }
+        else if (entry.isFile() && entry.name.toLowerCase().endsWith(".html")) {
+            return entryPath;
+        }
+    }
+    return undefined;
+}
+async function assertOutputPathInside(publicDir, outputPath) {
+    const realPublicDir = await realpath(publicDir);
+    let existingAncestor = outputPath;
+    while (true) {
+        try {
+            existingAncestor = await realpath(existingAncestor);
+            break;
+        }
+        catch (error) {
+            if (error.code !== "ENOENT")
+                throw error;
+            try {
+                await lstat(existingAncestor);
+                throw new Error("[farm:search] Search output must stay inside the public output directory, including through symlinks");
+            }
+            catch (statError) {
+                if (statError.code !== "ENOENT")
+                    throw statError;
+            }
+            const parent = path.dirname(existingAncestor);
+            if (parent === existingAncestor)
+                throw error;
+            existingAncestor = parent;
+        }
+    }
+    const relative = path.relative(realPublicDir, existingAncestor);
+    if (relative === ".." || relative.startsWith(`..${path.sep}`) || path.isAbsolute(relative)) {
+        throw new Error("[farm:search] Search output must stay inside the public output directory, including through symlinks");
+    }
+}
 function pagefindError(action, errors) {
     const details = errors.length ? `:\n${errors.map((error) => `  - ${error}`).join("\n")}` : "";
     return new Error(`[farm:search] Pagefind ${action}${details}`);

package/dist/client-runtime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client-runtime.d.ts","sourceRoot":"","sources":["../src/client-runtime.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,gBAAgB,EAChB,sBAAsB,EACtB,mBAAmB,EACnB,kBAAkB,EAInB,MAAM,YAAY,CAAC;AAEpB,UAAU,sBAAsB;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAClC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,WAAW,EAAE,KAAK,CAAC;QACjB,KAAK,EAAE,MAAM,CAAC;QACd,GAAG,EAAE,MAAM,CAAC;QACZ,OAAO,EAAE,MAAM,CAAC;QAChB,aAAa,EAAE,MAAM,CAAC;KACvB,CAAC,CAAC;CACJ;AAED,UAAU,oBAAoB;IAC5B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,IAAI,IAAI,OAAO,CAAC,sBAAsB,CAAC,CAAC;CACzC;AAED,UAAU,sBAAsB;IAC9B,OAAO,EAAE,oBAAoB,EAAE,CAAC;IAChC,qBAAqB,EAAE,MAAM,CAAC;IAC9B,OAAO,EAAE,kBAAkB,CAAC;IAC5B,YAAY,EAAE,kBAAkB,CAAC;IACjC,OAAO,EACH;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,GAClD,KAAK,CAAC;QACJ,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,MAAM,CAAC;KACf,CAAC,CAAC;CACR;AAED,MAAM,WAAW,kBAAkB;IACjC,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACzD,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACtB,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAAC;IAChG,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACxE,OAAO,IAAI,OAAO,CAAC,kBAAkB,CAAC,CAAC;IACvC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1B;AAED,MAAM,WAAW,qBAAsB,SAAQ,kBAAkB;IAC/D,cAAc,CAAC,CACb,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAChC,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;CACrD;AAED,MAAM,MAAM,oBAAoB,GAAG,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,qBAAqB,CAAC,CAAC;AAEnF,wBAAgB,kBAAkB,CAChC,aAAa,EAAE,MAAM,sBAAsB,EAC3C,OAAO,EAAE,mBAAmB,EAC5B,UAAU,EAAE,oBAAoB,GAC/B,gBAAgB,CA0FlB"}
+{"version":3,"file":"client-runtime.d.ts","sourceRoot":"","sources":["../src/client-runtime.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,gBAAgB,EAChB,sBAAsB,EACtB,mBAAmB,EACnB,kBAAkB,EAInB,MAAM,YAAY,CAAC;AAEpB,UAAU,sBAAsB;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAClC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,WAAW,EAAE,KAAK,CAAC;QACjB,KAAK,EAAE,MAAM,CAAC;QACd,GAAG,EAAE,MAAM,CAAC;QACZ,OAAO,EAAE,MAAM,CAAC;QAChB,aAAa,EAAE,MAAM,CAAC;KACvB,CAAC,CAAC;CACJ;AAED,UAAU,oBAAoB;IAC5B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,IAAI,IAAI,OAAO,CAAC,sBAAsB,CAAC,CAAC;CACzC;AAED,UAAU,sBAAsB;IAC9B,OAAO,EAAE,oBAAoB,EAAE,CAAC;IAChC,qBAAqB,EAAE,MAAM,CAAC;IAC9B,OAAO,EAAE,kBAAkB,CAAC;IAC5B,YAAY,EAAE,kBAAkB,CAAC;IACjC,OAAO,EACH;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,GAClD,KAAK,CAAC;QACJ,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,MAAM,CAAC;KACf,CAAC,CAAC;CACR;AAED,MAAM,WAAW,kBAAkB;IACjC,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACzD,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACtB,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAAC;IAChG,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACxE,OAAO,IAAI,OAAO,CAAC,kBAAkB,CAAC,CAAC;IACvC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1B;AAED,MAAM,WAAW,qBAAsB,SAAQ,kBAAkB;IAC/D,cAAc,CAAC,CACb,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAChC,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;CACrD;AAED,MAAM,MAAM,oBAAoB,GAAG,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,qBAAqB,CAAC,CAAC;AAEnF,wBAAgB,kBAAkB,CAChC,aAAa,EAAE,MAAM,sBAAsB,EAC3C,OAAO,EAAE,mBAAmB,EAC5B,UAAU,EAAE,oBAAoB,GAC/B,gBAAgB,CA2JlB"}

package/dist/client-runtime.js

@@ -1,14 +1,39 @@
 export function createSearchClient(resolveConfig, options, loadModule) {
-    let loaded;
-    const getApi = async () => {
+    let loading;
+    /**
+     * Stop handing this instance out and destroy it once every in-flight call
+     * has released it. Destroying eagerly is the bug this replaces: a
+     * bundle-path change or destroy() could tear the engine down under a
+     * search(), preload(), or filters() call that had already resolved it.
+     */
+    const retire = (instance) => {
+        if (!instance.retired) {
+            instance.retired = true;
+            instance.drained = (async () => {
+                if (instance.uses > 0) {
+                    await new Promise((resolve) => {
+                        instance.resolveDrained = resolve;
+                    });
+                }
+                await instance.api.destroy();
+            })();
+        }
+        return instance.drained;
+    };
+    const release = (instance) => {
+        instance.uses -= 1;
+        if (instance.retired && instance.uses === 0)
+            instance.resolveDrained?.();
+    };
+    const getInstance = async () => {
         const config = resolveConfig();
         if (!config.available && !options.bundlePath) {
             throw new Error("[farm:search] The search index is generated by production builds. " +
                 "Run farm build and serve the production output before searching.");
         }
         const bundlePath = normalizeBundlePath(options.bundlePath ?? config.bundlePath);
-        if (!loaded) {
-            const loading = loadModule(`${bundlePath}pagefind.js`)
+        if (!loading) {
+            const attempt = loadModule(`${bundlePath}pagefind.js`)
                 .then(async (module) => {
                 const highlightParam = options.highlightParam === false
                     ? undefined
@@ -22,21 +47,49 @@ export function createSearchClient(resolveConfig, options, loadModule) {
                 if (!module.createInstance)
                     await api.options(pagefindOptions);
                 await api.init();
-                return { api, bundlePath };
+                return { api, bundlePath, uses: 0, retired: false };
             })
                 .catch((error) => {
-                loaded = undefined;
+                if (loading === attempt)
+                    loading = undefined;
                 throw error;
             });
-            loaded = loading;
+            loading = attempt;
         }
-        const current = await loaded;
+        const attempt = loading;
+        const current = await attempt;
         if (current.bundlePath !== bundlePath) {
-            await current.api.destroy();
-            loaded = undefined;
-            return getApi();
+            // Only clear our own load: a concurrent caller that noticed the same
+            // stale bundle may already have started the replacement.
+            if (loading === attempt)
+                loading = undefined;
+            // Drain the old engine in the background; the swap must not wait for
+            // calls that are still finishing against it. Its destroy() failure has
+            // no caller to surface to here — an explicit destroy() still reports it.
+            void retire(current).catch(() => { });
+            return getInstance();
+        }
+        return current;
+    };
+    /** Resolve an instance and hold it for the duration of one call. */
+    const withApi = async (run) => {
+        for (;;) {
+            const instance = await getInstance();
+            instance.uses += 1;
+            if (instance.retired) {
+                // Retired between resolving and acquiring; hand it back and take the
+                // replacement instead of running against an engine that may already
+                // be destroyed.
+                release(instance);
+                continue;
+            }
+            try {
+                return await run(instance.api);
+            }
+            finally {
+                release(instance);
+            }
         }
-        return current.api;
     };
     return {
         async search(term, queryOptions = {}) {
@@ -46,36 +99,40 @@ export function createSearchClient(resolveConfig, options, loadModule) {
             const limit = normalizePositiveInteger(queryOptions.limit ?? 20, "limit");
             const offset = normalizeOffset(queryOptions.offset ?? 0);
             const pagefindOptions = engineOptions(queryOptions);
-            const api = await getApi();
-            const response = await api.search(term, pagefindOptions);
-            const handles = response.results.slice(offset, offset + limit);
-            const results = await Promise.all(handles.map(loadResult));
-            return {
-                results,
-                total: response.results.length,
-                unfilteredTotal: response.unfilteredResultCount,
-                filters: response.filters,
-                totalFilters: response.totalFilters,
-                timings: combineTimings(response.timings),
-            };
+            // Result fragments load lazily, so the instance stays held until they
+            // have loaded too, not just through the initial query.
+            return withApi(async (api) => {
+                const response = await api.search(term, pagefindOptions);
+                const handles = response.results.slice(offset, offset + limit);
+                const results = await Promise.all(handles.map(loadResult));
+                return {
+                    results,
+                    total: response.results.length,
+                    unfilteredTotal: response.unfilteredResultCount,
+                    filters: response.filters,
+                    totalFilters: response.totalFilters,
+                    timings: combineTimings(response.timings),
+                };
+            });
         },
         async preload(term, queryOptions = {}) {
             if (typeof term !== "string")
                 throw new TypeError("Search preload term must be a string");
             const pagefindOptions = engineOptions(queryOptions);
-            const api = await getApi();
-            await api.preload(term, pagefindOptions);
+            await withApi((api) => api.preload(term, pagefindOptions));
         },
         async filters() {
-            const api = await getApi();
-            return api.filters();
+            return withApi((api) => api.filters());
         },
         async destroy() {
-            if (!loaded)
+            if (!loading)
                 return;
-            const current = await loaded;
-            loaded = undefined;
-            await current.api.destroy();
+            const attempt = loading;
+            const current = await attempt.catch(() => undefined);
+            if (loading === attempt)
+                loading = undefined;
+            if (current)
+                await retire(current);
         },
     };
 }

package/dist/config.js

@@ -57,11 +57,30 @@ function normalizeOutput(value) {
         value.includes("\\") ||
         value.includes("?") ||
         value.includes("#") ||
-        segments.some((segment) => segment === "." || segment === ".." || !segment)) {
+        segments.some((segment) => !isStableOutputSegment(segment))) {
         throw new TypeError("Search output must stay inside the public output directory");
     }
     return normalized;
 }
+function isStableOutputSegment(segment) {
+    if (!segment)
+        return false;
+    let decoded = segment;
+    try {
+        decoded = decodeURIComponent(segment);
+    }
+    catch {
+        // Malformed escapes remain literal in browser pathnames.
+    }
+    return (decoded !== "." &&
+        decoded !== ".." &&
+        !decoded.includes("/") &&
+        !decoded.includes("\\") &&
+        !Array.from(decoded).some((character) => {
+            const code = character.charCodeAt(0);
+            return code <= 31 || (code >= 127 && code <= 159);
+        }));
+}
 function normalizeLanguage(value) {
     const normalized = normalizeOptionalString(value, "language")?.toLowerCase();
     if (normalized && !/^[a-z]{2}$/.test(normalized)) {

package/dist/index.d.ts

@@ -1,6 +1,7 @@
 import { type SearchOptions } from "./config.js";
+import type { FarmSearchPublicConfig } from "./types.js";
 export type { ResolvedSearchOptions, SearchOptions } from "./config.js";
 export type { FarmSearchClient, SearchClientOptions, SearchFilterCounts, SearchFilterExpression, SearchFilterPrimitive, SearchFilters, SearchQueryOptions, SearchResponse, SearchResult, SearchSort, SearchSubResult, SearchTimings, } from "./types.js";
 /** Build a static Pagefind index from Farm's emitted HTML pages. */
-export declare function search(options?: SearchOptions): import("@farm.js/core/plugin").FarmPlugin;
+export declare function search(options?: SearchOptions): import("@farm.js/core/plugin").FarmPlugin<undefined, Record<string, never>, void, FarmSearchPublicConfig, unknown, false, import("@farm.js/core/plugin").PluginRoutes>;
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAwB,KAAK,aAAa,EAAE,MAAM,aAAa,CAAC;AAGvE,YAAY,EAAE,qBAAqB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACxE,YAAY,EACV,gBAAgB,EAChB,mBAAmB,EACnB,kBAAkB,EAClB,sBAAsB,EACtB,qBAAqB,EACrB,aAAa,EACb,kBAAkB,EAClB,cAAc,EACd,YAAY,EACZ,UAAU,EACV,eAAe,EACf,aAAa,GACd,MAAM,YAAY,CAAC;AAEpB,oEAAoE;AACpE,wBAAgB,MAAM,CAAC,OAAO,GAAE,aAAkB,6CAuFjD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAwB,KAAK,aAAa,EAAE,MAAM,aAAa,CAAC;AACvE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AAEzD,YAAY,EAAE,qBAAqB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACxE,YAAY,EACV,gBAAgB,EAChB,mBAAmB,EACnB,kBAAkB,EAClB,sBAAsB,EACtB,qBAAqB,EACrB,aAAa,EACb,kBAAkB,EAClB,cAAc,EACd,YAAY,EACZ,UAAU,EACV,eAAe,EACf,aAAa,GACd,MAAM,YAAY,CAAC;AAEpB,oEAAoE;AACpE,wBAAgB,MAAM,CAAC,OAAO,GAAE,aAAkB,0KAkGjD"}

package/dist/index.js

@@ -5,6 +5,7 @@ import { resolveSearchOptions } from "./config.js";
 export function search(options = {}) {
     const resolved = resolveSearchOptions(options);
     let configuredBasePath = "/";
+    let htmlBasePath = "/";
     let generated = false;
     const publicConfig = {
         available: false,
@@ -20,6 +21,14 @@ export function search(options = {}) {
                 throw new Error("[farm:search] Configure search in one search() plugin instance");
             }
             configuredBasePath = normalizeBasePath(config.basePath);
+            // RouteManager emits ordinary SSG paths relative to the app, while its
+            // localized SSG paths already include basePath. Do not infer this from
+            // folder names: an application route can have the same name as basePath.
+            const i18n = config.i18n;
+            htmlBasePath =
+                i18n && typeof i18n === "object" && "enabled" in i18n && i18n.enabled
+                    ? configuredBasePath
+                    : "/";
             publicConfig.bundlePath = `${withBasePath(`/${resolved.output}`, configuredBasePath)}/`;
         },
         build: {
@@ -37,6 +46,7 @@ export function search(options = {}) {
                         publicDir: nitroConfig.output?.publicDir,
                         preset: nitroConfig.preset ?? "node-server",
                         basePath: configuredBasePath,
+                        htmlBasePath,
                         options: resolved,
                     });
                     generated = true;
@@ -60,6 +70,7 @@ export function search(options = {}) {
                     outputDir: result.outputDir ?? `${result.root}/.farm/.output`,
                     preset: result.preset,
                     basePath: configuredBasePath,
+                    htmlBasePath,
                     options: resolved,
                 });
                 generated = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@farm.js/search",
-  "version": "0.1.0-beta.0",
+  "version": "0.1.0-beta.10",
   "description": "Build-time static page search for Farm.js applications",
   "keywords": [
     "farm.js",
@@ -37,7 +37,7 @@
   },
   "dependencies": {
     "pagefind": "^1.5.2",
-    "@farm.js/core": "0.1.0-beta.92"
+    "@farm.js/core": "0.1.6"
   },
   "devDependencies": {
     "@types/node": "^20.10.5",