zudoku 0.0.0-e614aaa → 0.0.0-e64b729

package/dist/vite/prerender/FileWritingResponse.js

@@ -1,13 +1,13 @@
 import fs from "node:fs/promises";
 import path from "path";
 export class FileWritingResponse {
-    options;
-    buffer = "";
-    dontSave = false;
     resolve = () => { };
     resolved = new Promise((res) => (this.resolve = res));
+    dontSave = false;
+    buffer = "";
     redirectedTo;
     statusCode = 200;
+    options;
     set() { }
     status(status) {
         this.statusCode = status;
@@ -30,10 +30,10 @@ export class FileWritingResponse {
         this.redirectedTo = url;
         void this.end();
     }
-    send = async (chunk) => {
+    async send(chunk) {
         this.write(chunk);
         await this.end();
-    };
+    }
     write(chunk, _encoding) {
         this.buffer += chunk;
     }

package/dist/vite/prerender/FileWritingResponse.js.map

@@ -1 +1 @@
-{"version":3,"file":"FileWritingResponse.js","sourceRoot":"","sources":["../../../src/vite/prerender/FileWritingResponse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,MAAM,OAAO,mBAAmB;IAkBpB;IAjBF,MAAM,GAAG,EAAE,CAAC;IACZ,QAAQ,GAAG,KAAK,CAAC;IACjB,OAAO,GAAG,GAAG,EAAE,GAAE,CAAC,CAAC;IACnB,QAAQ,GAAG,IAAI,OAAO,CAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC,CAAC,CAAC;IAC7D,YAAY,CAAU;IACtB,UAAU,GAAG,GAAG,CAAC;IAExB,GAAG,KAAI,CAAC;IACR,MAAM,CAAC,MAAc;QACnB,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC;QACzB,IAAI,MAAM,IAAI,GAAG,EAAE,CAAC;YAClB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACvB,CAAC;IACH,CAAC;IACD,EAAE,KAAI,CAAC;IAEP,YACU,OAGP;QAHO,YAAO,GAAP,OAAO,CAGd;IACA,CAAC;IAEJ,QAAQ,CAAC,MAAc,EAAE,GAAW;QAClC,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC;QACzB,IAAI,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC;YAChC,IAAI,CAAC,KAAK,CACR,6DAA6D,GAAG,IAAI,CACrE,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACvB,CAAC;QACD,IAAI,CAAC,YAAY,GAAG,GAAG,CAAC;QACxB,KAAK,IAAI,CAAC,GAAG,EAAE,CAAC;IAClB,CAAC;IAED,IAAI,GAAG,KAAK,EAAE,KAAa,EAAE,EAAE;QAC7B,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAClB,MAAM,IAAI,CAAC,GAAG,EAAE,CAAC;IACnB,CAAC,CAAC;IAEF,KAAK,CAAC,KAAa,EAAE,SAAkB;QACrC,IAAI,CAAC,MAAM,IAAI,KAAK,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,KAAK,GAAG,EAAE;QAClB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnB,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YACzE,MAAM,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,CAAC;QACjE,CAAC;QACD,IAAI,CAAC,OAAO,EAAE,CAAC;IACjB,CAAC;IAED,MAAM;QACJ,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;CACF"}
+{"version":3,"file":"FileWritingResponse.js","sourceRoot":"","sources":["../../../src/vite/prerender/FileWritingResponse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,MAAM,CAAC;AAGxB,MAAM,OAAO,mBAAmB;IACtB,OAAO,GAAG,GAAG,EAAE,GAAE,CAAC,CAAC;IACnB,QAAQ,GAAG,IAAI,OAAO,CAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC,CAAC,CAAC;IAC5D,QAAQ,GAAG,KAAK,CAAC;IAElB,MAAM,GAAG,EAAE,CAAC;IACZ,YAAY,CAAU;IACtB,UAAU,GAAG,GAAG,CAAC;IACjB,OAAO,CAAgD;IAE9D,GAAG,KAAI,CAAC;IACR,MAAM,CAAC,MAAc;QACnB,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC;QACzB,IAAI,MAAM,IAAI,GAAG,EAAE,CAAC;YAClB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACvB,CAAC;IACH,CAAC;IACD,EAAE,KAAI,CAAC;IAEP,YAAY,OAAsD;QAChE,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAED,QAAQ,CAAC,MAAc,EAAE,GAAW;QAClC,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC;QACzB,IAAI,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC;YAChC,IAAI,CAAC,KAAK,CACR,6DAA6D,GAAG,IAAI,CACrE,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACvB,CAAC;QACD,IAAI,CAAC,YAAY,GAAG,GAAG,CAAC;QACxB,KAAK,IAAI,CAAC,GAAG,EAAE,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,KAAa;QACtB,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAClB,MAAM,IAAI,CAAC,GAAG,EAAE,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,KAAa,EAAE,SAAkB;QACrC,IAAI,CAAC,MAAM,IAAI,KAAK,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,KAAK,GAAG,EAAE;QAClB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnB,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YACzE,MAAM,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,CAAC;QACjE,CAAC;QACD,IAAI,CAAC,OAAO,EAAE,CAAC;IACjB,CAAC;IAED,MAAM;QACJ,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;CACF"}

package/dist/vite/prerender/InMemoryResponse.d.ts

@@ -0,0 +1,16 @@
+import type { PrerenderResponse } from "./PrerenderResponse.js";
+export declare class InMemoryResponse implements PrerenderResponse {
+    private resolve;
+    private resolved;
+    buffer: string;
+    redirectedTo?: string;
+    statusCode: number;
+    set(): void;
+    status(status: number): void;
+    on(): void;
+    redirect(status: number, url: string): void;
+    send(chunk: string): Promise<void>;
+    write(chunk: string, _encoding?: string): void;
+    end(chunk?: string): Promise<void>;
+    isSent(): Promise<void>;
+}

package/dist/vite/prerender/InMemoryResponse.js

@@ -0,0 +1,32 @@
+export class InMemoryResponse {
+    resolve = () => { };
+    resolved = new Promise((res) => (this.resolve = res));
+    buffer = "";
+    redirectedTo;
+    statusCode = 200;
+    set() { }
+    status(status) {
+        this.statusCode = status;
+    }
+    on() { }
+    redirect(status, url) {
+        this.statusCode = status;
+        this.redirectedTo = url;
+        void this.end();
+    }
+    async send(chunk) {
+        this.write(chunk);
+        await this.end();
+    }
+    write(chunk, _encoding) {
+        this.buffer += chunk;
+    }
+    async end(chunk = "") {
+        this.buffer += chunk;
+        this.resolve();
+    }
+    isSent() {
+        return this.resolved;
+    }
+}
+//# sourceMappingURL=InMemoryResponse.js.map

package/dist/vite/prerender/InMemoryResponse.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"InMemoryResponse.js","sourceRoot":"","sources":["../../../src/vite/prerender/InMemoryResponse.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,gBAAgB;IACnB,OAAO,GAAG,GAAG,EAAE,GAAE,CAAC,CAAC;IACnB,QAAQ,GAAG,IAAI,OAAO,CAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC,CAAC,CAAC;IAE7D,MAAM,GAAG,EAAE,CAAC;IACZ,YAAY,CAAU;IACtB,UAAU,GAAG,GAAG,CAAC;IAExB,GAAG,KAAI,CAAC;IACR,MAAM,CAAC,MAAc;QACnB,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC;IAC3B,CAAC;IACD,EAAE,KAAI,CAAC;IAEP,QAAQ,CAAC,MAAc,EAAE,GAAW;QAClC,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC;QACzB,IAAI,CAAC,YAAY,GAAG,GAAG,CAAC;QACxB,KAAK,IAAI,CAAC,GAAG,EAAE,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,KAAa;QACtB,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAClB,MAAM,IAAI,CAAC,GAAG,EAAE,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,KAAa,EAAE,SAAkB;QACrC,IAAI,CAAC,MAAM,IAAI,KAAK,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,KAAK,GAAG,EAAE;QAClB,IAAI,CAAC,MAAM,IAAI,KAAK,CAAC;QACrB,IAAI,CAAC,OAAO,EAAE,CAAC;IACjB,CAAC;IAED,MAAM;QACJ,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;CACF"}

package/dist/vite/prerender/PrerenderResponse.d.ts

@@ -0,0 +1,10 @@
+export interface PrerenderResponse {
+    set(): void;
+    status(status: number): void;
+    on(): void;
+    redirect(status: number, url: string): void;
+    send(chunk: string): Promise<void>;
+    write(chunk: string, encoding?: string): void;
+    end(chunk?: string): Promise<void>;
+    isSent(): Promise<void>;
+}

package/dist/vite/prerender/PrerenderResponse.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=PrerenderResponse.js.map

package/dist/vite/prerender/PrerenderResponse.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"PrerenderResponse.js","sourceRoot":"","sources":["../../../src/vite/prerender/PrerenderResponse.ts"],"names":[],"mappings":""}

package/dist/vite/prerender/prerender.d.ts

@@ -1,5 +1,6 @@
 export type WorkerResult = {
     outputPath: string;
+    html: string;
     redirect?: {
         from: string;
         to: string;

package/dist/vite/prerender/prerender.js

@@ -1,7 +1,11 @@
+import os from "node:os";
 import path from "node:path";
 import { pathToFileURL } from "node:url";
+import { createIndex } from "pagefind";
 import colors from "picocolors";
 import PiscinaImport from "piscina";
+import { logger } from "../../cli/common/logger.js";
+import invariant from "../../lib/util/invariant.js";
 import { isTTY, throttle, writeLine } from "../reporter.js";
 import { generateSitemap } from "../sitemap.js";
 const Piscina = PiscinaImport;
@@ -26,8 +30,10 @@ const routesToPaths = (routes) => {
 };
 export const prerender = async ({ html, dir, basePath = "", serverConfigFilename, writeRedirects = true, }) => {
     const distDir = path.join(dir, "dist", basePath);
-    const config = await import(pathToFileURL(path.join(distDir, "server", serverConfigFilename)).href).then((m) => m.default);
-    const module = await import(pathToFileURL(path.join(distDir, "server/entry.server.js")).href);
+    const serverConfigPath = pathToFileURL(path.join(distDir, "server", serverConfigFilename)).href;
+    const entryServerPath = pathToFileURL(path.join(distDir, "server/entry.server.js")).href;
+    const config = await import(serverConfigPath).then((m) => m.default);
+    const module = await import(entryServerPath);
     const getRoutes = module.getRoutesByConfig;
     const routes = getRoutes(config);
     const paths = routesToPaths(routes);
@@ -38,41 +44,60 @@ export const prerender = async ({ html, dir, basePath = "", serverConfigFilename
         writeLine(`prerendering (${count}/${total}) ${colors.dim(urlPath)}`);
     });
     if (!isTTY()) {
-        // eslint-disable-next-line no-console
-        console.log(`prerendering ${paths.length} routes...`);
+        logger.info(colors.dim(`prerendering ${paths.length} routes...`));
     }
     let completedCount = 0;
-    const serverOutDir = path.join(distDir, "server");
+    let pagefindIndex;
+    if (config.search?.type === "pagefind") {
+        const { index, errors } = await createIndex();
+        invariant(index, `Failed to create pagefind index: ${JSON.stringify(errors)}`);
+        pagefindIndex = index;
+    }
     const pool = new Piscina({
         filename: new URL("./worker.js", import.meta.url).href,
-        idleTimeout: 1000,
+        idleTimeout: 5_000,
+        maxThreads: Math.floor(os.cpus().length * 0.8),
         workerData: {
             template: html,
             distDir,
-            serverConfigPath: path.join(serverOutDir, serverConfigFilename),
-            entryServerPath: path.join(serverOutDir, "entry.server.js"),
+            serverConfigPath,
+            entryServerPath,
             writeRedirects,
         },
     });
     const workerResults = await Promise.all(paths.map(async (urlPath) => {
         const result = await pool.run({ urlPath });
+        await pagefindIndex?.addHTMLFile({
+            url: urlPath,
+            content: result.html,
+        });
         completedCount++;
         if (isTTY()) {
             writeProgress(completedCount, paths.length, urlPath);
         }
         else {
             const now = performance.now();
-            if (now - lastLogTime >= LOG_INTERVAL_MS ||
-                completedCount === paths.length) {
-                // eslint-disable-next-line no-console
-                console.log(`prerendered ${completedCount}/${paths.length} routes`);
+            if (now - lastLogTime >= LOG_INTERVAL_MS) {
+                logger.info(colors.blue(`prerendered ${completedCount}/${paths.length} routes`));
                 lastLogTime = now;
             }
         }
         return result;
     }));
+    const pagefindWriteResult = await pagefindIndex?.writeFiles({
+        outputPath: path.join(distDir, "pagefind"),
+    });
     const seconds = ((performance.now() - start) / 1000).toFixed(1);
-    writeLine(colors.blue(`✓ prerendered ${paths.length} routes in ${seconds} seconds\n`));
+    const message = `✓ finished prerendering ${paths.length} routes in ${seconds} seconds`;
+    if (isTTY()) {
+        writeLine(colors.blue(message + "\n"));
+    }
+    else {
+        logger.info(colors.blue(message));
+    }
+    if (pagefindWriteResult?.outputPath) {
+        logger.info(colors.blue(`✓ pagefind index built: ${pagefindWriteResult.outputPath}`));
+    }
     await generateSitemap({
         basePath: config.basePath,
         outputUrls: paths,

package/dist/vite/prerender/prerender.js.map

@@ -1 +1 @@
-{"version":3,"file":"prerender.js","sourceRoot":"","sources":["../../../src/vite/prerender/prerender.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"prerender.js","sourceRoot":"","sources":["../../../src/vite/prerender/prerender.ts"],"names":[],"mappings":"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"}

package/dist/vite/prerender/worker.js

@@ -1,32 +1,59 @@
 import path from "node:path";
-import { pathToFileURL } from "node:url";
 import Piscina from "piscina";
+import { matchPath } from "react-router";
 import { joinUrl } from "../../lib/util/joinUrl.js";
 import { FileWritingResponse } from "./FileWritingResponse.js";
+import { InMemoryResponse } from "./InMemoryResponse.js";
 const { template, distDir, serverConfigPath, entryServerPath, writeRedirects } = Piscina.workerData;
-const [render, config] = (await Promise.all([
-    import(pathToFileURL(entryServerPath).href).then((m) => m.render),
-    import(pathToFileURL(serverConfigPath).href).then((m) => m.default),
-]));
+const server = await import(entryServerPath);
+const config = await import(serverConfigPath).then((m) => m.default);
+const routes = server.getRoutesByConfig(config);
+const { basePath } = config;
 const renderPage = async ({ urlPath }) => {
     const filename = urlPath === "/" ? "/index.html" : `${urlPath}.html`;
-    const pathname = joinUrl(config.basePath, urlPath);
+    const pathname = joinUrl(basePath, urlPath);
     const url = joinUrl("http://localhost", pathname);
     const outputPath = path.join(distDir, filename);
     const request = new Request(url);
-    const response = new FileWritingResponse({
+    const fileResponse = new FileWritingResponse({
         fileName: outputPath,
         writeRedirects,
     });
-    await render({ template, request, response, config });
-    await response.isSent();
-    if (response.statusCode >= 500) {
-        throw new Error(`SSR failed with status ${response.statusCode} for path: ${urlPath}`);
+    const sharedOpts = { template, request, routes, basePath };
+    const isProtectedRoute = config.protectedRoutes?.some((route) => matchPath(route, urlPath));
+    let html;
+    // For protected routes, we need a second render pass with protection bypassed
+    // so we can build a full search index
+    if (isProtectedRoute) {
+        const bypassResponse = new InMemoryResponse();
+        await Promise.all([
+            server.render({ ...sharedOpts, response: fileResponse }),
+            server.render({
+                ...sharedOpts,
+                response: bypassResponse,
+                bypassProtection: true,
+            }),
+            fileResponse.isSent(),
+            bypassResponse.isSent(),
+        ]);
+        html = bypassResponse.buffer;
     }
-    const redirect = response.redirectedTo
-        ? { from: pathname, to: response.redirectedTo }
+    else {
+        await server.render({ ...sharedOpts, response: fileResponse });
+        await fileResponse.isSent();
+        html = fileResponse.buffer;
+    }
+    if (fileResponse.statusCode >= 500) {
+        throw new Error(`SSR failed with status ${fileResponse.statusCode} for path: ${urlPath}`);
+    }
+    const redirect = fileResponse.redirectedTo
+        ? { from: pathname, to: fileResponse.redirectedTo }
         : undefined;
-    return { outputPath, redirect };
+    return {
+        outputPath,
+        redirect,
+        html,
+    };
 };
 export default renderPage;
 //# sourceMappingURL=worker.js.map

package/dist/vite/prerender/worker.js.map

@@ -1 +1 @@
-{"version":3,"file":"worker.js","sourceRoot":"","sources":["../../../src/vite/prerender/worker.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,OAAO,MAAM,SAAS,CAAC;AAG9B,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAa/D,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,cAAc,EAAE,GAC5E,OAAO,CAAC,UAA8B,CAAC;AAEzC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC;IAC1C,MAAM,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;IACjE,MAAM,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;CACpE,CAAC,CAAwC,CAAC;AAE3C,MAAM,UAAU,GAAG,KAAK,EAAE,EAAE,OAAO,EAAc,EAAyB,EAAE;IAC1E,MAAM,QAAQ,GAAG,OAAO,KAAK,GAAG,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,GAAG,OAAO,OAAO,CAAC;IACrE,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IACnD,MAAM,GAAG,GAAG,OAAO,CAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAC;IAClD,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IAEhD,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC,CAAC;IACjC,MAAM,QAAQ,GAAG,IAAI,mBAAmB,CAAC;QACvC,QAAQ,EAAE,UAAU;QACpB,cAAc;KACf,CAAC,CAAC;IAEH,MAAM,MAAM,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;IACtD,MAAM,QAAQ,CAAC,MAAM,EAAE,CAAC;IAExB,IAAI,QAAQ,CAAC,UAAU,IAAI,GAAG,EAAE,CAAC;QAC/B,MAAM,IAAI,KAAK,CACb,0BAA0B,QAAQ,CAAC,UAAU,cAAc,OAAO,EAAE,CACrE,CAAC;IACJ,CAAC;IAED,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY;QACpC,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,QAAQ,CAAC,YAAY,EAAE;QAC/C,CAAC,CAAC,SAAS,CAAC;IAEd,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC;AAClC,CAAC,CAAC;AAEF,eAAe,UAAU,CAAC"}
+{"version":3,"file":"worker.js","sourceRoot":"","sources":["../../../src/vite/prerender/worker.ts"],"names":[],"mappings":"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"}

package/dist/vite/sitemap.d.ts

@@ -1,4 +1,4 @@
-import { ZudokuSiteMapConfig } from "../config/validators/common.js";
+import type { ZudokuSiteMapConfig } from "../config/validators/validate.js";
 export declare function generateSitemap({ outputUrls, basePath, baseOutputDir, config, }: {
     /**
      * The base path of the site (e.g. `/docs`).

package/dist/zuplo/enrich-with-zuplo.d.ts

@@ -1,5 +1,5 @@
-import { RecordAny } from "../lib/util/traverse.js";
-import { PoliciesConfigFile } from "./policy-types.js";
+import type { ProcessorArg } from "../config/validators/BuildSchema.js";
+import type { PoliciesConfigFile } from "./policy-types.js";
 export declare const enrichWithZuploData: ({ policiesConfig, }: {
     policiesConfig: PoliciesConfigFile;
-}) => (spec: RecordAny) => RecordAny;
+}) => ({ schema }: ProcessorArg) => import("../lib/oas/parser/index.js").OpenAPIDocument;

package/dist/zuplo/enrich-with-zuplo.js

@@ -1,3 +1,4 @@
+import { objectEntries } from "../lib/util/objectEntries.js";
 const API_KEY_REPLACEMENT_STRING = "YOUR_KEY_HERE";
 const enrichWithApiKeyData = (operationObject, apiKeyPolicies) => {
     if (apiKeyPolicies.length === 0) {
@@ -114,11 +115,11 @@ const rateLimitingResponseWithHeader = {
     },
 };
 export const enrichWithZuploData = ({ policiesConfig, }) => {
-    return (spec) => {
-        if (!spec.paths)
-            return spec;
+    return ({ schema }) => {
+        if (!schema.paths)
+            return schema;
         let hasRateLimitPolicies = false;
-        for (const [, pathItem] of Object.entries(spec.paths)) {
+        for (const [, pathItem] of objectEntries(schema.paths)) {
             for (const method of operations) {
                 const operation = pathItem[method];
                 if (!operation?.["x-zuplo-route"])
@@ -157,12 +158,12 @@ export const enrichWithZuploData = ({ policiesConfig, }) => {
         // Add security scheme if we have API key policies
         if (policiesConfig.policies?.some((policy) => policy.handler.export === "ApiAuthKeyInboundPolicy" ||
             policy.handler.export === "ApiKeyInboundPolicy")) {
-            if (!spec.components)
-                spec.components = {};
-            if (!spec.components.securitySchemes)
-                spec.components.securitySchemes = {};
-            if (!spec.components.securitySchemes.api_key) {
-                spec.components.securitySchemes.api_key = {
+            if (!schema.components)
+                schema.components = {};
+            if (!schema.components.securitySchemes)
+                schema.components.securitySchemes = {};
+            if (!schema.components.securitySchemes.api_key) {
+                schema.components.securitySchemes.api_key = {
                     type: "http",
                     scheme: "bearer",
                 };
@@ -170,15 +171,15 @@ export const enrichWithZuploData = ({ policiesConfig, }) => {
         }
         // Add rate limiting responses only if we found rate limiting policies
         if (hasRateLimitPolicies) {
-            if (!spec.components)
-                spec.components = {};
-            if (!spec.components.responses)
-                spec.components.responses = {};
-            spec.components.responses.RateLimitNoRetryAfter = rateLimitingResponse;
-            spec.components.responses.RateLimitWithRetryAfter =
+            if (!schema.components)
+                schema.components = {};
+            if (!schema.components.responses)
+                schema.components.responses = {};
+            schema.components.responses.RateLimitNoRetryAfter = rateLimitingResponse;
+            schema.components.responses.RateLimitWithRetryAfter =
                 rateLimitingResponseWithHeader;
         }
-        return spec;
+        return schema;
     };
 };
 //# sourceMappingURL=enrich-with-zuplo.js.map

package/dist/zuplo/enrich-with-zuplo.js.map

@@ -1 +1 @@
-{"version":3,"file":"enrich-with-zuplo.js","sourceRoot":"","sources":["../../src/zuplo/enrich-with-zuplo.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"enrich-with-zuplo.js","sourceRoot":"","sources":["../../src/zuplo/enrich-with-zuplo.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAO7D,MAAM,0BAA0B,GAAG,eAAe,CAAC;AAEnD,MAAM,oBAAoB,GAAG,CAC3B,eAA0B,EAC1B,cAA6C,EAC7C,EAAE;IACF,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAChC,OAAO,eAAe,CAAC;IACzB,CAAC;IAED,MAAM,WAAW,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC;IACtC,MAAM,mBAAmB,GACtB,WAAW,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,YAAY,CAAY,IAAI,eAAe,CAAC;IAC9E,MAAM,mBAAmB,GAAG,CAAC,WAAW,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,YAAY,CAAC;QACvE,QAAQ,CAAW,CAAC;IACtB,MAAM,iBAAiB,GACrB,mBAAmB,KAAK,EAAE;QACxB,CAAC,CAAC,GAAG,mBAAmB,IAAI,0BAA0B,EAAE;QACxD,CAAC,CAAC,0BAA0B,CAAC;IAEjC,+BAA+B;IAC/B,MAAM,YAAY,GAAgC;QAChD,IAAI,EAAE,mBAAmB;QACzB,EAAE,EAAE,QAAQ;QACZ,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,iBAAiB;QAC1B,MAAM,EAAE;YACN,IAAI,EAAE,QAAQ;SACf;QACD,WAAW,EAAE,SAAS,mBAAmB,+FAA+F,iBAAiB,KAAK;KAC/J,CAAC;IAEF,MAAM,UAAU,GAAG,eAAe,CAAC,UAAU,IAAI,EAAE,CAAC;IACpD,IACE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,KAAgB,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,mBAAmB,CAAC,EAC1E,CAAC;QACD,eAAe,CAAC,UAAU,GAAG,CAAC,YAAY,EAAE,GAAG,UAAU,CAAC,CAAC;IAC7D,CAAC;IAED,sCAAsC;IACtC,MAAM,mBAAmB,GAAG,SAAS,CAAC;IACtC,MAAM,yBAAyB,GAAG,EAAE,CAAC,mBAAmB,CAAC,EAAE,EAAE,EAAE,CAAC;IAEhE,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC;QAC9B,eAAe,CAAC,QAAQ,GAAG,CAAC,yBAAyB,CAAC,CAAC;IACzD,CAAC;SAAM,IACL,CAAC,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAc,EAAE,EAAE,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC,EAC5E,CAAC;QACD,eAAe,CAAC,QAAQ,GAAG;YACzB,yBAAyB;YACzB,GAAG,eAAe,CAAC,QAAQ;SAC5B,CAAC;IACJ,CAAC;IAED,OAAO,eAAe,CAAC;AACzB,CAAC,CAAC;AAEF,MAAM,uBAAuB,GAAG,CAC9B,eAA0B,EAC1B,iBAAgD,EAChD,EAAE;IACF,IAAI,iBAAiB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACnC,OAAO,eAAe,CAAC;IACzB,CAAC;IAED,MAAM,mBAAmB,GAAG,iBAAiB,CAAC,IAAI,CAChD,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,UAAU,KAAK,MAAM,CAC1D,CAAC;IAEF,IAAI,CAAC,eAAe,CAAC,SAAS,EAAE,CAAC;QAC/B,eAAe,CAAC,SAAS,GAAG,EAAE,CAAC;IACjC,CAAC;IAED,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;QACtC,eAAe,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG;YACjC,IAAI,EAAE,mBAAmB;gBACvB,CAAC,CAAC,gDAAgD;gBAClD,CAAC,CAAC,8CAA8C;SACnD,CAAC;IACJ,CAAC;IAED,OAAO,eAAe,CAAC;AACzB,CAAC,CAAC;AAEF,kBAAkB;AAClB,MAAM,UAAU,GAAG;IACjB,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ;IAC9B,SAAS,EAAE,MAAM,EAAE,OAAO,EAAG,OAAO;CACrC,CAAC;AAEF,MAAM,oBAAoB,GAA+B;IACvD,WAAW,EAAE,wBAAwB;IACrC,OAAO,EAAE;QACP,kBAAkB,EAAE;YAClB,MAAM,EAAE;gBACN,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC;gBACrC,QAAQ,EAAE;oBACR;wBACE,IAAI,EAAE,0CAA0C;wBAChD,KAAK,EAAE,mBAAmB;wBAC1B,MAAM,EAAE,GAAG;wBACX,QAAQ,EAAE,UAAU;qBACrB;iBACF;gBACD,UAAU,EAAE;oBACV,IAAI,EAAE;wBACJ,IAAI,EAAE,QAAQ;wBACd,OAAO,EAAE,0CAA0C;wBACnD,WAAW,EAAE,8CAA8C;qBAC5D;oBACD,KAAK,EAAE;wBACL,IAAI,EAAE,QAAQ;wBACd,OAAO,EAAE,mBAAmB;wBAC5B,WAAW,EAAE,iDAAiD;qBAC/D;oBACD,MAAM,EAAE;wBACN,IAAI,EAAE,QAAQ;wBACd,OAAO,EAAE,GAAG;wBACZ,WAAW,EAAE,uBAAuB;qBACrC;oBACD,QAAQ,EAAE;wBACR,IAAI,EAAE,QAAQ;wBACd,OAAO,EAAE,UAAU;qBACpB;iBACF;aACF;SACF;KACF;CACF,CAAC;AAEF,MAAM,8BAA8B,GAA+B;IACjE,GAAG,oBAAoB;IACvB,OAAO,EAAE;QACP,aAAa,EAAE;YACb,WAAW,EAAE,4DAA4D;YACzE,MAAM,EAAE;gBACN,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,EAAE;aACZ;SACF;KACF;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,EAClC,cAAc,GAGf,EAAE,EAAE;IACH,OAAO,CAAC,EAAE,MAAM,EAAgB,EAAE,EAAE;QAClC,IAAI,CAAC,MAAM,CAAC,KAAK;YAAE,OAAO,MAAM,CAAC;QAEjC,IAAI,oBAAoB,GAAG,KAAK,CAAC;QAEjC,KAAK,MAAM,CAAC,EAAE,QAAQ,CAAC,IAAI,aAAa,CAAY,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;YAClE,KAAK,MAAM,MAAM,IAAI,UAAU,EAAE,CAAC;gBAChC,MAAM,SAAS,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC;gBACnC,IAAI,CAAC,SAAS,EAAE,CAAC,eAAe,CAAC;oBAAE,SAAS;gBAE5C,MAAM,eAAe,GAAG,SAAS,CAC/B,eAAe,CAChB,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,GAAa,EAAE,UAAkB,EAAE,EAAE;oBACjE,MAAM,MAAM,GAAG,cAAc,CAAC,QAAQ,EAAE,IAAI,CAC1C,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,KAAK,UAAU,CAClC,CAAC;oBACF,IAAI,CAAC,MAAM;wBAAE,OAAO,GAAG,CAAC;oBAExB,4BAA4B;oBAC5B,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,KAAK,wBAAwB,EAAE,CAAC;wBACvD,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,QAEjC,CAAC;wBACd,OAAO,aAAa,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,EAAE,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;oBAC1D,CAAC;oBAED,OAAO,CAAC,GAAG,GAAG,EAAE,UAAU,CAAC,CAAC;gBAC9B,CAAC,EAAE,EAAE,CAAC,CAAC;gBAEP,IAAI,CAAC,eAAe;oBAAE,SAAS;gBAE/B,wBAAwB;gBACxB,MAAM,cAAc,GAClB,cAAc,CAAC,QAAQ,EAAE,MAAM,CAC7B,CAAC,MAAM,EAAE,EAAE,CACT,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC;oBACrC,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,KAAK,yBAAyB;wBAClD,MAAM,CAAC,OAAO,CAAC,MAAM,KAAK,qBAAqB,CAAC;oBAClD,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO;wBACrB,EAAE,4CAA4C,CACnD,IAAI,EAAE,CAAC;gBAEV,2BAA2B;gBAC3B,MAAM,iBAAiB,GACrB,cAAc,CAAC,QAAQ,EAAE,MAAM,CAC7B,CAAC,MAAM,EAAE,EAAE,CACT,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC;oBACrC,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,KAAK,wBAAwB;wBACjD,MAAM,CAAC,OAAO,CAAC,MAAM,KAAK,+BAA+B,CAAC,CAC/D,IAAI,EAAE,CAAC;gBAEV,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACjC,oBAAoB,GAAG,IAAI,CAAC;gBAC9B,CAAC;gBAED,8CAA8C;gBAC9C,QAAQ,CAAC,MAAM,CAAC,GAAG,oBAAoB,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;gBACnE,QAAQ,CAAC,MAAM,CAAC,GAAG,uBAAuB,CACxC,QAAQ,CAAC,MAAM,CAAC,EAChB,iBAAiB,CAClB,CAAC;YACJ,CAAC;QACH,CAAC;QAED,kDAAkD;QAClD,IACE,cAAc,CAAC,QAAQ,EAAE,IAAI,CAC3B,CAAC,MAAM,EAAE,EAAE,CACT,MAAM,CAAC,OAAO,CAAC,MAAM,KAAK,yBAAyB;YACnD,MAAM,CAAC,OAAO,CAAC,MAAM,KAAK,qBAAqB,CAClD,EACD,CAAC;YACD,IAAI,CAAC,MAAM,CAAC,UAAU;gBAAE,MAAM,CAAC,UAAU,GAAG,EAAE,CAAC;YAC/C,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,eAAe;gBACpC,MAAM,CAAC,UAAU,CAAC,eAAe,GAAG,EAAE,CAAC;YAEzC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC;gBAC/C,MAAM,CAAC,UAAU,CAAC,eAAe,CAAC,OAAO,GAAG;oBAC1C,IAAI,EAAE,MAAM;oBACZ,MAAM,EAAE,QAAQ;iBACjB,CAAC;YACJ,CAAC;QACH,CAAC;QAED,sEAAsE;QACtE,IAAI,oBAAoB,EAAE,CAAC;YACzB,IAAI,CAAC,MAAM,CAAC,UAAU;gBAAE,MAAM,CAAC,UAAU,GAAG,EAAE,CAAC;YAC/C,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,SAAS;gBAAE,MAAM,CAAC,UAAU,CAAC,SAAS,GAAG,EAAE,CAAC;YACnE,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,qBAAqB,GAAG,oBAAoB,CAAC;YACzE,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,uBAAuB;gBACjD,8BAA8B,CAAC;QACnC,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC;AACJ,CAAC,CAAC"}

package/dist/zuplo/with-zuplo-processors.d.ts

@@ -1,3 +1,3 @@
-import { type RecordAny } from "../lib/util/traverse.js";
-export declare const getProcessors: (rootDir: string) => Promise<((doc: RecordAny) => RecordAny)[]>;
+import type { Processor } from "../config/validators/BuildSchema.js";
+export declare const getProcessors: (rootDir: string) => Promise<Processor[]>;
 export default getProcessors;

package/dist/zuplo/with-zuplo-processors.js

@@ -1,10 +1,10 @@
 import fs from "node:fs/promises";
 import path from "node:path";
-import { removeExtensions } from "../lib/plugins/openapi/post-processors/removeExtensions.js";
-import { removeParameters } from "../lib/plugins/openapi/post-processors/removeParameters.js";
-import { removePaths } from "../lib/plugins/openapi/post-processors/removePaths.js";
+import { ZuploEnv } from "../app/env.js";
+import { removeExtensions } from "../lib/plugins/openapi/processors/removeExtensions.js";
+import { removeParameters } from "../lib/plugins/openapi/processors/removeParameters.js";
+import { removePaths } from "../lib/plugins/openapi/processors/removePaths.js";
 import { enrichWithZuploData } from "./enrich-with-zuplo.js";
-import { ZuploEnv } from "./env.js";
 export const getProcessors = async (rootDir) => {
     const policiesConfig = JSON.parse(await fs.readFile(path.join(rootDir, "../config/policies.json"), "utf-8"));
     return [
@@ -13,11 +13,11 @@ export const getProcessors = async (rootDir) => {
             shouldRemove: ({ parameter }) => parameter["x-internal"],
         }),
         enrichWithZuploData({ policiesConfig }),
-        (spec) => {
+        ({ schema }) => {
             const url = ZuploEnv.serverUrl;
             if (!url)
-                return spec;
-            return { ...spec, servers: [{ url }] };
+                return schema;
+            return { ...schema, servers: [{ url }] };
         },
         removeExtensions({ shouldRemove: (key) => key.startsWith("x-zuplo") }),
     ];

package/dist/zuplo/with-zuplo-processors.js.map

@@ -1 +1 @@
-{"version":3,"file":"with-zuplo-processors.js","sourceRoot":"","sources":["../../src/zuplo/with-zuplo-processors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,gBAAgB,EAAE,MAAM,4DAA4D,CAAC;AAC9F,OAAO,EAAE,gBAAgB,EAAE,MAAM,4DAA4D,CAAC;AAC9F,OAAO,EAAE,WAAW,EAAE,MAAM,uDAAuD,CAAC;AAEpF,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEpC,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,EAAE,OAAe,EAAE,EAAE;IACrD,MAAM,cAAc,GAAG,IAAI,CAAC,KAAK,CAC/B,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,yBAAyB,CAAC,EAAE,OAAO,CAAC,CAC1E,CAAC;IAEF,OAAO;QACL,WAAW,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,CAAC;QACzE,gBAAgB,CAAC;YACf,YAAY,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,SAAS,CAAC,YAAY,CAAC;SACzD,CAAC;QACF,mBAAmB,CAAC,EAAE,cAAc,EAAE,CAAC;QACvC,CAAC,IAAe,EAAE,EAAE;YAClB,MAAM,GAAG,GAAG,QAAQ,CAAC,SAAS,CAAC;YAC/B,IAAI,CAAC,GAAG;gBAAE,OAAO,IAAI,CAAC;YACtB,OAAO,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC;QACzC,CAAC;QACD,gBAAgB,CAAC,EAAE,YAAY,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;KACvE,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,aAAa,CAAC"}
+{"version":3,"file":"with-zuplo-processors.js","sourceRoot":"","sources":["../../src/zuplo/with-zuplo-processors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAKzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,uDAAuD,CAAC;AACzF,OAAO,EAAE,gBAAgB,EAAE,MAAM,uDAAuD,CAAC;AACzF,OAAO,EAAE,WAAW,EAAE,MAAM,kDAAkD,CAAC;AAC/E,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAE7D,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,EAAE,OAAe,EAAwB,EAAE;IAC3E,MAAM,cAAc,GAAG,IAAI,CAAC,KAAK,CAC/B,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,yBAAyB,CAAC,EAAE,OAAO,CAAC,CAC1E,CAAC;IAEF,OAAO;QACL,WAAW,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,CAAC;QACzE,gBAAgB,CAAC;YACf,YAAY,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,SAAS,CAAC,YAAY,CAAC;SACzD,CAAC;QACF,mBAAmB,CAAC,EAAE,cAAc,EAAE,CAAC;QACvC,CAAC,EAAE,MAAM,EAAgB,EAAE,EAAE;YAC3B,MAAM,GAAG,GAAG,QAAQ,CAAC,SAAS,CAAC;YAC/B,IAAI,CAAC,GAAG;gBAAE,OAAO,MAAM,CAAC;YACxB,OAAO,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC;QAC3C,CAAC;QACD,gBAAgB,CAAC,EAAE,YAAY,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;KACvE,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,aAAa,CAAC"}

package/dist/zuplo/with-zuplo.d.ts

@@ -1,3 +1,6 @@
-import { CommonConfig } from "../config/validators/common.js";
-declare const withZuplo: <TConfig extends CommonConfig>(config: TConfig) => TConfig;
+import type { ZudokuConfig } from "../config/validators/validate.js";
+/**
+ *  @deprecated `withZuplo` is no longer needed and will automatically be applied. It will be removed in a future version.
+ */
+declare const withZuplo: (config: ZudokuConfig) => ZudokuConfig;
 export default withZuplo;

package/dist/zuplo/with-zuplo.js

@@ -1,9 +1,10 @@
+/**
+ *  @deprecated `withZuplo` is no longer needed and will automatically be applied. It will be removed in a future version.
+ */
 const withZuplo = (config) => {
-    return {
-        ...config,
-        isZuplo: true,
-        enableStatusPages: true,
-    };
+    // eslint-disable-next-line no-console
+    console.warn("`withZuplo` is no longer needed and will automatically be applied. It will be removed in a future version.");
+    return config;
 };
 export default withZuplo;
 //# sourceMappingURL=with-zuplo.js.map

package/dist/zuplo/with-zuplo.js.map

@@ -1 +1 @@
-{"version":3,"file":"with-zuplo.js","sourceRoot":"","sources":["../../src/zuplo/with-zuplo.ts"],"names":[],"mappings":"AAEA,MAAM,SAAS,GAAG,CAA+B,MAAe,EAAW,EAAE;IAC3E,OAAO;QACL,GAAG,MAAM;QACT,OAAO,EAAE,IAAI;QACb,iBAAiB,EAAE,IAAI;KACxB,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,SAAS,CAAC"}
+{"version":3,"file":"with-zuplo.js","sourceRoot":"","sources":["../../src/zuplo/with-zuplo.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,MAAM,SAAS,GAAG,CAAC,MAAoB,EAAgB,EAAE;IACvD,sCAAsC;IACtC,OAAO,CAAC,IAAI,CACV,4GAA4G,CAC7G,CAAC;IACF,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF,eAAe,SAAS,CAAC"}

package/lib/Button-u7M2QYds.js

@@ -0,0 +1,51 @@
+import { j as i } from "./jsx-runtime-C5mzlN2N.js";
+import { Slot as a } from "@radix-ui/react-slot";
+import { c as u } from "./index-C1S4w-gl.js";
+import * as c from "react";
+import { c as x } from "./cn-BOFVZgHd.js";
+const f = u(
+  "not-prose inline-flex shrink-0 items-center justify-center whitespace-nowrap rounded-md text-sm font-medium transition-colors focus-visible:outline-hidden focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50",
+  {
+    variants: {
+      variant: {
+        default: "bg-primary text-primary-foreground shadow-sm hover:bg-primary/90",
+        destructive: "bg-destructive text-destructive-foreground shadow-xs hover:bg-destructive/90",
+        outline: "border border-input bg-background shadow-xs hover:bg-accent hover:text-accent-foreground",
+        secondary: "bg-secondary text-secondary-foreground shadow-xs hover:bg-secondary/80",
+        ghost: "hover:bg-accent hover:text-accent-foreground",
+        "ghost-destructive": "text-destructive hover:bg-destructive hover:text-destructive-foreground",
+        link: "text-primary underline-offset-4 hover:underline",
+        expand: "flex gap-1.5 border bg-transparent rounded-xl text-muted-foreground hover:text-foreground"
+      },
+      size: {
+        default: "h-9 px-4 py-2",
+        sm: "h-8 rounded-md px-3 text-xs",
+        lg: "h-10 rounded-md px-8",
+        xl: "h-14 rounded-lg px-10 text-lg",
+        icon: "size-9",
+        "icon-xs": "size-7"
+      }
+    },
+    defaultVariants: {
+      variant: "default",
+      size: "default"
+    }
+  }
+), g = c.forwardRef(
+  ({ className: e, variant: t, size: r, asChild: o = !1, ...n }, s) => {
+    const d = o ? a : "button";
+    return /* @__PURE__ */ i.jsx(
+      d,
+      {
+        className: x(f({ variant: t, size: r, className: e })),
+        ref: s,
+        ...n
+      }
+    );
+  }
+);
+g.displayName = "Button";
+export {
+  g as B
+};
+//# sourceMappingURL=Button-u7M2QYds.js.map

package/lib/Button-u7M2QYds.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Button-u7M2QYds.js","sources":["../src/lib/ui/Button.tsx"],"sourcesContent":["import { Slot } from \"@radix-ui/react-slot\";\nimport { cva, type VariantProps } from \"class-variance-authority\";\nimport * as React from \"react\";\nimport { cn } from \"../util/cn.js\";\n\nexport const buttonVariants = cva(\n  \"not-prose inline-flex shrink-0 items-center justify-center whitespace-nowrap rounded-md text-sm font-medium transition-colors focus-visible:outline-hidden focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50\",\n  {\n    variants: {\n      variant: {\n        default:\n          \"bg-primary text-primary-foreground shadow-sm hover:bg-primary/90\",\n        destructive:\n          \"bg-destructive text-destructive-foreground shadow-xs hover:bg-destructive/90\",\n        outline:\n          \"border border-input bg-background shadow-xs hover:bg-accent hover:text-accent-foreground\",\n        secondary:\n          \"bg-secondary text-secondary-foreground shadow-xs hover:bg-secondary/80\",\n        ghost: \"hover:bg-accent hover:text-accent-foreground\",\n        \"ghost-destructive\":\n          \"text-destructive hover:bg-destructive hover:text-destructive-foreground\",\n        link: \"text-primary underline-offset-4 hover:underline\",\n        expand:\n          \"flex gap-1.5 border bg-transparent rounded-xl text-muted-foreground hover:text-foreground\",\n      },\n      size: {\n        default: \"h-9 px-4 py-2\",\n        sm: \"h-8 rounded-md px-3 text-xs\",\n        lg: \"h-10 rounded-md px-8\",\n        xl: \"h-14 rounded-lg px-10 text-lg\",\n        icon: \"size-9\",\n        \"icon-xs\": \"size-7\",\n      },\n    },\n    defaultVariants: {\n      variant: \"default\",\n      size: \"default\",\n    },\n  },\n);\n\nexport interface ButtonProps\n  extends React.ButtonHTMLAttributes<HTMLButtonElement>,\n    VariantProps<typeof buttonVariants> {\n  asChild?: boolean;\n}\n\nexport const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(\n  ({ className, variant, size, asChild = false, ...props }, ref) => {\n    const Comp = asChild ? Slot : \"button\";\n    return (\n      <Comp\n        className={cn(buttonVariants({ variant, size, className }))}\n        ref={ref}\n        {...props}\n      />\n    );\n  },\n);\nButton.displayName = \"Button\";\n"],"names":["buttonVariants","cva","Button","React","className","variant","size","asChild","props","ref","Comp","Slot","jsx","cn"],"mappings":";;;;;AAKO,MAAMA,IAAiBC;AAAA,EAC5B;AAAA,EACA;AAAA,IACE,UAAU;AAAA,MACR,SAAS;AAAA,QACP,SACE;AAAA,QACF,aACE;AAAA,QACF,SACE;AAAA,QACF,WACE;AAAA,QACF,OAAO;AAAA,QACP,qBACE;AAAA,QACF,MAAM;AAAA,QACN,QACE;AAAA,MACJ;AAAA,MACA,MAAM;AAAA,QACJ,SAAS;AAAA,QACT,IAAI;AAAA,QACJ,IAAI;AAAA,QACJ,IAAI;AAAA,QACJ,MAAM;AAAA,QACN,WAAW;AAAA,MAAA;AAAA,IAEf;AAAA,IACA,iBAAiB;AAAA,MACf,SAAS;AAAA,MACT,MAAM;AAAA,IAAA;AAAA,EACR;AAEJ,GAQaC,IAASC,EAAM;AAAA,EAC1B,CAAC,EAAE,WAAAC,GAAW,SAAAC,GAAS,MAAAC,GAAM,SAAAC,IAAU,IAAO,GAAGC,EAAM,GAAGC,MAAQ;AAC1D,UAAAC,IAAOH,IAAUI,IAAO;AAE5B,WAAAC,gBAAAA,EAAA;AAAA,MAACF;AAAA,MAAA;AAAA,QACC,WAAWG,EAAGb,EAAe,EAAE,SAAAK,GAAS,MAAAC,GAAM,WAAAF,EAAA,CAAW,CAAC;AAAA,QAC1D,KAAAK;AAAA,QACC,GAAGD;AAAA,MAAA;AAAA,IACN;AAAA,EAAA;AAGN;AACAN,EAAO,cAAc;"}