zudoku 0.0.0-f3f6db5 → 0.0.0-f471fb8

package/dist/vite/dev-server.js

@@ -1,21 +1,41 @@
 import express from "express";
 import { createHttpTerminator } from "http-terminator";
+import fs from "node:fs/promises";
+import http from "node:http";
+import https from "node:https";
 import path from "node:path";
 import { createServer as createViteServer, isRunnableDevEnvironment, } from "vite";
 import { logger } from "../cli/common/logger.js";
 import { printDiagnosticsToConsole } from "../cli/common/output.js";
+import { findAvailablePort } from "../cli/common/utils/ports.js";
 import { createGraphQLServer } from "../lib/oas/graphql/index.js";
 import { getAppClientEntryPath, getAppServerEntryPath, getViteConfig, loadZudokuConfig, } from "./config.js";
 import { errorMiddleware } from "./error-handler.js";
 import { getDevHtml } from "./html.js";
+const DEFAULT_DEV_PORT = 3000;
 export class DevServer {
     options;
-    server;
     currentConfig;
     terminator;
+    resolvedPort = 0;
+    protocol = "http";
     constructor(options) {
         this.options = options;
     }
+    async createNodeServer(app, config) {
+        if (!config.https)
+            return http.createServer(app);
+        this.protocol = "https";
+        const { dir } = this.options;
+        const [key, cert, ca] = await Promise.all([
+            fs.readFile(path.resolve(dir, config.https.key)),
+            fs.readFile(path.resolve(dir, config.https.cert)),
+            config.https.ca
+                ? fs.readFile(path.resolve(dir, config.https.ca))
+                : undefined,
+        ]);
+        return https.createServer({ key, cert, ca }, app);
+    }
     async start() {
         const app = express();
         const configEnv = {
@@ -24,13 +44,16 @@ export class DevServer {
             isSsrBuild: this.options.ssr,
         };
         const viteConfig = await getViteConfig(this.options.dir, configEnv, (zudokuConfig) => (this.currentConfig = zudokuConfig));
+        const { config } = await loadZudokuConfig(configEnv, this.options.dir);
+        this.currentConfig = config;
+        this.resolvedPort = await findAvailablePort(this.options.argPort ?? config.port ?? DEFAULT_DEV_PORT);
+        const server = await this.createNodeServer(app, config);
         viteConfig.server = {
             ...viteConfig.server,
             open: this.options.open,
+            hmr: { server },
         };
         const vite = await createViteServer(viteConfig);
-        const { config } = await loadZudokuConfig(configEnv, this.options.dir);
-        this.currentConfig = config;
         const graphql = createGraphQLServer({
             graphqlEndpoint: "/__z/graphql",
         });
@@ -57,6 +80,14 @@ export class DevServer {
         });
         app.use(vite.middlewares);
         printDiagnosticsToConsole(`Server-side rendering ${this.options.ssr ? "enabled" : "disabled"}`);
+        if (config.search?.type === "pagefind") {
+            const pagefindPath = path.join(vite.config.publicDir, "pagefind/pagefind.js");
+            const exists = await fs.stat(pagefindPath).catch(() => false);
+            if (!exists) {
+                await fs.mkdir(path.dirname(pagefindPath), { recursive: true });
+                await fs.writeFile(pagefindPath, 'throw new Error("NOT_BUILT_YET");');
+            }
+        }
         app.use("*", async (request, response, next) => {
             const url = request.originalUrl;
             const ssrEnvironment = vite.environments.ssr;
@@ -70,13 +101,13 @@ export class DevServer {
                     if (!this.currentConfig) {
                         throw new Error("Error loading configuration.");
                     }
-                    const module = await ssrEnvironment.runner.import(getAppServerEntryPath());
-                    const render = module.render;
-                    void render({
+                    const server = await ssrEnvironment.runner.import(getAppServerEntryPath());
+                    void server.render({
                         template,
                         request,
                         response,
-                        config: this.currentConfig,
+                        routes: server.getRoutesByConfig(this.currentConfig),
+                        basePath: this.currentConfig.basePath,
                     });
                 }
                 else {
@@ -92,12 +123,11 @@ export class DevServer {
             }
         });
         app.use(errorMiddleware(vite));
-        return new Promise((resolve) => {
-            this.server = app.listen(this.options.port, () => resolve({ vite, express: app }));
-            this.terminator = createHttpTerminator({
-                server: this.server,
-            });
+        await new Promise((resolve) => {
+            server.listen(this.resolvedPort, () => resolve());
         });
+        this.terminator = createHttpTerminator({ server });
+        return { vite, express: app };
     }
     async stop() {
         await this.terminator?.terminate();

package/dist/vite/dev-server.js.map

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

package/dist/vite/error-handler.d.ts

@@ -1,3 +1,3 @@
 import { NextFunction, Request, Response } from "express";
 import { ViteDevServer } from "vite";
-export declare const errorMiddleware: (server: ViteDevServer) => (err: Error, req: Request, res: Response, next: NextFunction) => void;
+export declare const errorMiddleware: (server: ViteDevServer) => (err: Error, _req: Request, res: Response, _next: NextFunction) => Promise<void>;

package/dist/vite/error-handler.js

@@ -1,5 +1,5 @@
 import path from "node:path";
-export const errorMiddleware = (server) => (err, req, res, next) => {
+export const errorMiddleware = (server) => async (err, _req, res, _next) => {
     server.ssrFixStacktrace(err);
     const error = {
         message: err.message,

package/dist/vite/error-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"error-handler.js","sourceRoot":"","sources":["../../src/vite/error-handler.ts"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,WAAW,CAAC;AAG7B,MAAM,CAAC,MAAM,eAAe,GAC1B,CAAC,MAAqB,EAAE,EAAE,CAC1B,CAAC,GAAU,EAAE,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;IAC9D,MAAM,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;IAC7B,MAAM,KAAK,GAAG;QACZ,OAAO,EAAE,GAAG,CAAC,OAAO;QACpB,KAAK,EAAE,GAAG,CAAC,KAAK;KACjB,CAAC;IAEF,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC;IACrB,GAAG,CAAC,GAAG,CAAC;;;;;;;8BAOkB,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC;;wDAEpB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;;;;;;;;;;;;;;;;;;;OAmBrH,CAAC,CAAC;AACP,CAAC,CAAC"}
+{"version":3,"file":"error-handler.js","sourceRoot":"","sources":["../../src/vite/error-handler.ts"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,WAAW,CAAC;AAG7B,MAAM,CAAC,MAAM,eAAe,GAC1B,CAAC,MAAqB,EAAE,EAAE,CAC1B,KAAK,EAAE,GAAU,EAAE,IAAa,EAAE,GAAa,EAAE,KAAmB,EAAE,EAAE;IACtE,MAAM,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;IAC7B,MAAM,KAAK,GAAG;QACZ,OAAO,EAAE,GAAG,CAAC,OAAO;QACpB,KAAK,EAAE,GAAG,CAAC,KAAK;KACjB,CAAC;IAEF,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC;IACrB,GAAG,CAAC,GAAG,CAAC;;;;;;;8BAOkB,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC;;wDAEpB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;;;;;;;;;;;;;;;;;;;OAmBrH,CAAC,CAAC;AACP,CAAC,CAAC"}

package/dist/vite/output.d.ts

@@ -96,6 +96,18 @@ type Cron = {
     schedule: string;
 };
 type CronsConfig = Cron[];
-export declare function generateOutput(config: LoadedConfig): Config;
-export declare function writeOutput(dir: string, config: LoadedConfig): Promise<void>;
+export declare function generateOutput({ config, redirects, }: {
+    config: LoadedConfig;
+    redirects: Array<{
+        from: string;
+        to: string;
+    }>;
+}): Config;
+export declare function writeOutput(dir: string, { config, redirects, }: {
+    config: LoadedConfig;
+    redirects: Array<{
+        from: string;
+        to: string;
+    }>;
+}): Promise<void>;
 export {};

package/dist/vite/output.js

@@ -2,21 +2,19 @@ import assert from "node:assert";
 import { mkdir, readFile, writeFile } from "node:fs/promises";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
-import { joinPath } from "../lib/util/joinPath.js";
+import { joinUrl } from "../lib/util/joinUrl.js";
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const pkgJsonPath = path.join(__dirname, "../../package.json");
 const pkgJson = JSON.parse(await readFile(pkgJsonPath, "utf-8"));
-export function generateOutput(config) {
+export function generateOutput({ config, redirects, }) {
     const routes = [];
-    if (config.redirects) {
-        for (const redirect of config.redirects) {
-            routes.push({
-                src: joinPath(config.basePath, redirect.from),
-                dest: joinPath(config.basePath, redirect.to),
-                status: 301,
-                headers: { Location: joinPath(config.basePath, redirect.to) },
-            });
-        }
+    for (const redirect of redirects) {
+        routes.push({
+            src: redirect.from,
+            dest: redirect.to,
+            status: 301,
+            headers: { Location: redirect.to },
+        });
     }
     if (process.env.VERCEL_SKEW_PROTECTION_ENABLED) {
         assert(process.env.VERCEL_DEPLOYMENT_ID);
@@ -30,7 +28,7 @@ export function generateOutput(config) {
                 },
             ],
             headers: {
-                "Set-Cookie": `__vdpl=${process.env.VERCEL_DEPLOYMENT_ID}; Path=${joinPath(config.basePath)}; SameSite=Strict; Secure; HttpOnly`,
+                "Set-Cookie": `__vdpl=${process.env.VERCEL_DEPLOYMENT_ID}; Path=${joinUrl(config.basePath)}; SameSite=Strict; Secure; HttpOnly`,
             },
             continue: true,
         });
@@ -44,8 +42,8 @@ export function generateOutput(config) {
     };
     return output;
 }
-export async function writeOutput(dir, config) {
-    const output = generateOutput(config);
+export async function writeOutput(dir, { config, redirects, }) {
+    const output = generateOutput({ config, redirects });
     // For now we are putting this in the dist folder, eventually we can
     // expand this to support the full vercel build output API
     const outputDir = process.env.VERCEL

package/dist/vite/output.js.map

@@ -1 +1 @@
-{"version":3,"file":"output.js","sourceRoot":"","sources":["../../src/vite/output.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"output.js","sourceRoot":"","sources":["../../src/vite/output.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEjD,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAC/D,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAC;AAE/D,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC;AAkIjE,MAAM,UAAU,cAAc,CAAC,EAC7B,MAAM,EACN,SAAS,GAIV;IACC,MAAM,MAAM,GAAY,EAAE,CAAC;IAE3B,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;QACjC,MAAM,CAAC,IAAI,CAAC;YACV,GAAG,EAAE,QAAQ,CAAC,IAAI;YAClB,IAAI,EAAE,QAAQ,CAAC,EAAE;YACjB,MAAM,EAAE,GAAG;YACX,OAAO,EAAE,EAAE,QAAQ,EAAE,QAAQ,CAAC,EAAE,EAAE;SACnC,CAAC,CAAC;IACL,CAAC;IAED,IAAI,OAAO,CAAC,GAAG,CAAC,8BAA8B,EAAE,CAAC;QAC/C,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;QAEzC,MAAM,CAAC,IAAI,CAAC;YACV,GAAG,EAAE,KAAK;YACV,GAAG,EAAE;gBACH;oBACE,IAAI,EAAE,QAAQ;oBACd,GAAG,EAAE,gBAAgB;oBACrB,KAAK,EAAE,UAAU;iBAClB;aACF;YACD,OAAO,EAAE;gBACP,YAAY,EAAE,UAAU,OAAO,CAAC,GAAG,CAAC,oBAAoB,UAAU,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,qCAAqC;aAChI;YACD,QAAQ,EAAE,IAAI;SACf,CAAC,CAAC;IACL,CAAC;IAED,MAAM,MAAM,GAAW;QACrB,OAAO,EAAE,CAAC;QACV,SAAS,EAAE;YACT,OAAO,EAAE,OAAO,CAAC,OAAO;SACzB;QACD,MAAM;KACP,CAAC;IAEF,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,GAAW,EACX,EACE,MAAM,EACN,SAAS,GAIV;IAED,MAAM,MAAM,GAAG,cAAc,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;IACrD,oEAAoE;IACpE,0DAA0D;IAE1D,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM;QAClC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,gBAAgB,CAAC;QAClC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;IAEnC,MAAM,KAAK,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC5C,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;IACvD,MAAM,SAAS,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;IAEtE,IAAI,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;QACvB,sCAAsC;QACtC,OAAO,CAAC,GAAG,CAAC,wBAAwB,EAAE,SAAS,CAAC,CAAC;IACnD,CAAC;AACH,CAAC"}

package/dist/vite/plugin-api-keys.d.ts

@@ -1,4 +1,4 @@
 import { type Plugin } from "vite";
-import { type ZudokuPluginOptions } from "../config/config.js";
-declare const viteApiKeysPlugin: (getConfig: () => ZudokuPluginOptions) => Plugin;
+import type { LoadedConfig } from "../config/config.js";
+declare const viteApiKeysPlugin: (getConfig: () => LoadedConfig) => Plugin;
 export default viteApiKeysPlugin;

package/dist/vite/plugin-api-keys.js

@@ -11,15 +11,15 @@ const viteApiKeysPlugin = (getConfig) => {
         async load(id) {
             if (id === resolvedVirtualModuleId) {
                 const config = getConfig();
-                if (!config.apiKeys || config.mode === "standalone") {
+                if (!config.apiKeys || config.__meta.mode === "standalone") {
                     return `export const configuredApiKeysPlugin = undefined;`;
                 }
                 const code = [
-                    `const config = ${JSON.stringify(config.apiKeys, null, 2)};`,
-                    config.mode === "internal"
-                        ? `import { apiKeyPlugin } from "${config.moduleDir}/src/lib/plugins/api-keys/index.tsx";`
+                    `import config from "virtual:zudoku-config";`,
+                    config.__meta.mode === "internal"
+                        ? `import { apiKeyPlugin } from "${config.__meta.moduleDir}/src/lib/plugins/api-keys/index.tsx";`
                         : `import { apiKeyPlugin } from "zudoku/plugins/api-keys";`,
-                    `export const configuredApiKeysPlugin = apiKeyPlugin(config);`,
+                    `export const configuredApiKeysPlugin = apiKeyPlugin(config.apiKeys);`,
                 ];
                 return {
                     code: code.join("\n"),

package/dist/vite/plugin-api-keys.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin-api-keys.js","sourceRoot":"","sources":["../../src/vite/plugin-api-keys.ts"],"names":[],"mappings":"AAGA,MAAM,iBAAiB,GAAG,CAAC,SAAoC,EAAU,EAAE;IACzE,MAAM,eAAe,GAAG,gCAAgC,CAAC;IACzD,MAAM,uBAAuB,GAAG,IAAI,GAAG,eAAe,CAAC;IACvD,OAAO;QACL,IAAI,EAAE,wBAAwB;QAC9B,SAAS,CAAC,EAAE;YACV,IAAI,EAAE,KAAK,eAAe,EAAE,CAAC;gBAC3B,OAAO,uBAAuB,CAAC;YACjC,CAAC;QACH,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,EAAE;YACX,IAAI,EAAE,KAAK,uBAAuB,EAAE,CAAC;gBACnC,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;gBAE3B,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;oBACpD,OAAO,mDAAmD,CAAC;gBAC7D,CAAC;gBAED,MAAM,IAAI,GAAG;oBACX,kBAAkB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG;oBAC5D,MAAM,CAAC,IAAI,KAAK,UAAU;wBACxB,CAAC,CAAC,iCAAiC,MAAM,CAAC,SAAS,uCAAuC;wBAC1F,CAAC,CAAC,yDAAyD;oBAC7D,8DAA8D;iBAC/D,CAAC;gBAEF,OAAO;oBACL,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;oBACrB,GAAG,EAAE,IAAI;iBACV,CAAC;YACJ,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"plugin-api-keys.js","sourceRoot":"","sources":["../../src/vite/plugin-api-keys.ts"],"names":[],"mappings":"AAGA,MAAM,iBAAiB,GAAG,CAAC,SAA6B,EAAU,EAAE;IAClE,MAAM,eAAe,GAAG,gCAAgC,CAAC;IACzD,MAAM,uBAAuB,GAAG,IAAI,GAAG,eAAe,CAAC;IACvD,OAAO;QACL,IAAI,EAAE,wBAAwB;QAC9B,SAAS,CAAC,EAAE;YACV,IAAI,EAAE,KAAK,eAAe,EAAE,CAAC;gBAC3B,OAAO,uBAAuB,CAAC;YACjC,CAAC;QACH,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,EAAE;YACX,IAAI,EAAE,KAAK,uBAAuB,EAAE,CAAC;gBACnC,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;gBAE3B,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;oBAC3D,OAAO,mDAAmD,CAAC;gBAC7D,CAAC;gBAED,MAAM,IAAI,GAAG;oBACX,6CAA6C;oBAC7C,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,UAAU;wBAC/B,CAAC,CAAC,iCAAiC,MAAM,CAAC,MAAM,CAAC,SAAS,uCAAuC;wBACjG,CAAC,CAAC,yDAAyD;oBAC7D,sEAAsE;iBACvE,CAAC;gBAEF,OAAO;oBACL,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;oBACrB,GAAG,EAAE,IAAI;iBACV,CAAC;YACJ,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,iBAAiB,CAAC"}

package/dist/vite/plugin-api.d.ts

@@ -1,4 +1,4 @@
 import { type Plugin } from "vite";
-import { type ZudokuPluginOptions } from "../config/config.js";
-declare const viteApiPlugin: (getConfig: () => ZudokuPluginOptions) => Promise<Plugin>;
+import { type LoadedConfig } from "../config/config.js";
+declare const viteApiPlugin: (getConfig: () => LoadedConfig) => Promise<Plugin>;
 export default viteApiPlugin;

package/dist/vite/plugin-api.js

@@ -1,44 +1,60 @@
+import { $RefParser, } from "@apidevtools/json-schema-ref-parser";
+import { upgrade, validate } from "@scalar/openapi-parser";
 import fs from "node:fs/promises";
 import path from "node:path";
 import { tsImport } from "tsx/esm/api";
-import yaml from "yaml";
-import { getAllTags } from "../lib/oas/graphql/index.js";
-import { upgradeSchema } from "../lib/oas/parser/upgrade/index.js";
+import { getAllOperations, getAllSlugs, getAllTags, } from "../lib/oas/graphql/index.js";
 import { generateCode } from "./api/schema-codegen.js";
+import { reload } from "./plugin-config-reload.js";
 const schemaMap = new Map();
-async function processSchemas(config, 
+const validateSchema = async (schema, filePath) => {
+    const validated = await validate(schema);
+    if (validated.errors?.length) {
+        // eslint-disable-next-line no-console
+        console.warn(`Schema warnings in ${filePath}:`);
+        for (const error of validated.errors) {
+            // eslint-disable-next-line no-console
+            console.warn(error);
+        }
+    }
+    return schema;
+};
+// We track all schema files to invalidate when changed (this includes external references as well)
+const allSchemaFiles = new Set();
+async function processSchemas(dir, config, 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 zuploProcessors = []) {
-    const tmpDir = path.posix.join(config.rootDir, "node_modules/.zudoku/processed");
-    await fs.rm(tmpDir, { recursive: true, force: true });
-    await fs.mkdir(tmpDir, { recursive: true });
     if (!config.apis)
         return {};
     const apis = Array.isArray(config.apis) ? config.apis : [config.apis];
     const processedSchemas = {};
+    allSchemaFiles.clear();
     for (const apiConfig of apis) {
         if (apiConfig.type !== "file" || !apiConfig.navigationId) {
             continue;
         }
         const postProcessors = [
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            (schema) => upgradeSchema(schema),
+            (schema) => upgrade(schema).specification,
             ...(apiConfig.postProcessors ?? []),
             ...zuploProcessors,
         ];
         const inputs = Array.isArray(apiConfig.input)
             ? apiConfig.input
             : [apiConfig.input];
-        const inputFiles = await Promise.all(inputs.map(async (input) => /\.ya?ml$/.test(input)
-            ? yaml.parse(await fs.readFile(input, "utf-8"))
-            : JSON.parse(await fs.readFile(input, "utf-8"))));
+        const inputFiles = await Promise.all(inputs.map(async (input) => {
+            const fullPath = path.resolve(config.__meta.rootDir, input);
+            const parser = new $RefParser();
+            const schema = await parser.bundle(fullPath);
+            parser.$refs.paths().forEach((file) => allSchemaFiles.add(file));
+            return validateSchema(schema, input);
+        }));
         const processedInputs = await Promise.all(inputFiles.map(async (schema, index) => {
-            const processedSchema = await postProcessors.reduce(async (acc, postProcessor) => postProcessor(await acc), schema);
+            const processedSchema = await postProcessors.reduce(async (acc, postProcessor) => postProcessor(await acc), Promise.resolve(schema));
             const inputPath = inputs[index];
-            const processedPath = path.posix.join(tmpDir, `${path.basename(inputPath)}.js`);
-            const code = await generateCode(processedSchema);
-            await fs.writeFile(processedPath, code);
-            schemaMap.set(inputPath, processedPath);
+            const code = await generateCode(processedSchema, inputPath);
+            const processedFilePath = path.posix.join(dir, `${path.basename(inputPath)}.js`);
+            await fs.writeFile(processedFilePath, code);
+            schemaMap.set(inputPath, processedFilePath);
             return {
                 schema: processedSchema,
                 version: processedSchema.info.version || "default",
@@ -59,7 +75,7 @@ const viteApiPlugin = async (getConfig) => {
     // Load Zuplo-specific processors if in Zuplo environment
     const zuploProcessors = initialConfig.isZuplo
         ? await tsImport("../zuplo/with-zuplo-processors.js", import.meta.url)
-            .then((m) => m.default(initialConfig.rootDir))
+            .then((m) => m.default(initialConfig.__meta.rootDir))
             .catch((e) => {
             // eslint-disable-next-line no-console
             console.warn("Failed to load Zuplo processors", e);
@@ -67,10 +83,21 @@ const viteApiPlugin = async (getConfig) => {
         })
         : [];
     let processedSchemas;
+    const tmpDir = path.posix.join(initialConfig.__meta.rootDir, "node_modules/.zudoku/processed");
     return {
         name: "zudoku-api-plugins",
         async buildStart() {
-            processedSchemas = await processSchemas(getConfig(), zuploProcessors);
+            await fs.rm(tmpDir, { recursive: true, force: true });
+            await fs.mkdir(tmpDir, { recursive: true });
+            processedSchemas = await processSchemas(tmpDir, getConfig(), zuploProcessors);
+        },
+        configureServer(server) {
+            server.watcher.on("change", async (id) => {
+                if (!allSchemaFiles.has(id))
+                    return;
+                processedSchemas = await processSchemas(tmpDir, getConfig(), zuploProcessors);
+                reload(server);
+            });
         },
         resolveId(id) {
             if (id === virtualModuleId) {
@@ -78,112 +105,112 @@ const viteApiPlugin = async (getConfig) => {
             }
         },
         async load(id) {
-            if (id === resolvedVirtualModuleId) {
-                const config = getConfig();
-                if (config.mode === "standalone") {
-                    return [
-                        "export const configuredApiPlugins = [];",
-                        "export const configuredApiCatalogPlugins = [];",
-                    ].join("\n");
+            if (id !== resolvedVirtualModuleId)
+                return;
+            const config = getConfig();
+            if (config.__meta.mode === "standalone") {
+                return [
+                    "export const configuredApiPlugins = [];",
+                    "export const configuredApiCatalogPlugins = [];",
+                ].join("\n");
+            }
+            const code = [
+                `import config from "virtual:zudoku-config";`,
+                `const configuredApiPlugins = [];`,
+                `const configuredApiCatalogPlugins = [];`,
+            ];
+            if (config.apis) {
+                code.push('import { openApiPlugin } from "zudoku/plugins/openapi";');
+                code.push(`const apis = Array.isArray(config.apis) ? config.apis : [config.apis]`);
+                const apis = Array.isArray(config.apis) ? config.apis : [config.apis];
+                const apiMetadata = [];
+                const versionMaps = {};
+                for (const apiConfig of apis) {
+                    if (apiConfig.type === "file" && apiConfig.navigationId) {
+                        const schemas = processedSchemas[apiConfig.navigationId];
+                        if (!schemas?.length)
+                            continue;
+                        const latestSchema = schemas[0]?.schema;
+                        if (!latestSchema?.info)
+                            continue;
+                        apiMetadata.push({
+                            path: apiConfig.navigationId,
+                            label: latestSchema.info.title,
+                            description: latestSchema.info.description ?? "",
+                            categories: apiConfig.categories ?? [],
+                        });
+                        const versionMap = Object.fromEntries(schemas.map((processed) => [
+                            processed.version,
+                            processed.inputPath,
+                        ]));
+                        if (Object.keys(versionMap).length > 0) {
+                            versionMaps[apiConfig.navigationId] = versionMap;
+                        }
+                    }
                 }
-                const apiPluginOptions = {
-                    options: {
-                        examplesDefaultLanguage: config.defaults?.examplesLanguage,
-                    },
-                };
-                const code = [
-                    `import config from "virtual:zudoku-config";`,
-                    `import { openApiPlugin } from "zudoku/plugins/openapi";`,
-                    `import { apiCatalogPlugin } from "zudoku/plugins/api-catalog";`,
-                    `const configuredApiPlugins = [];`,
-                    `const configuredApiCatalogPlugins = [];`,
-                    `const apiPluginOptions = ${JSON.stringify(apiPluginOptions)};`,
-                ];
-                if (config.apis) {
-                    const apis = Array.isArray(config.apis) ? config.apis : [config.apis];
-                    const apiMetadata = [];
-                    const versionMaps = {};
-                    for (const apiConfig of apis) {
-                        if (apiConfig.type === "file" && apiConfig.navigationId) {
-                            const schemas = processedSchemas[apiConfig.navigationId];
-                            if (!schemas?.length)
-                                continue;
-                            const latestSchema = schemas[0]?.schema;
-                            if (!latestSchema?.info)
-                                continue;
-                            apiMetadata.push({
-                                path: apiConfig.navigationId,
-                                label: latestSchema.info.title,
-                                description: latestSchema.info.description ?? "",
-                                categories: apiConfig.categories ?? [],
-                            });
-                            const versionMap = Object.fromEntries(schemas.map((processed) => [
-                                processed.version,
-                                processed.inputPath,
-                            ]));
-                            if (Object.keys(versionMap).length > 0) {
-                                versionMaps[apiConfig.navigationId] = versionMap;
-                            }
+                // Generate API plugin code
+                let apiIndex = -1;
+                for (const apiConfig of apis) {
+                    apiIndex++;
+                    if (apiConfig.type === "file") {
+                        if (!apiConfig.navigationId ||
+                            !versionMaps[apiConfig.navigationId]) {
+                            continue;
                         }
+                        const schemas = processedSchemas[apiConfig.navigationId];
+                        if (!schemas?.length)
+                            continue;
+                        const tags = Array.from(new Set(schemas
+                            .flatMap(({ schema }) => {
+                            const operations = getAllOperations(schema.paths);
+                            const slugs = getAllSlugs(operations);
+                            return getAllTags(schema, slugs.tags);
+                        })
+                            .map(({ slug }) => slug)));
+                        code.push("configuredApiPlugins.push(openApiPlugin({", `  type: "file",`, `  input: ${JSON.stringify(versionMaps[apiConfig.navigationId])},`, `  navigationId: ${JSON.stringify(apiConfig.navigationId)},`, `  tagPages: ${JSON.stringify(tags)},`, `  options: {`, `    examplesLanguage: config.defaults?.apis?.examplesLanguage ?? config.defaults?.examplesLanguage,`, `    disablePlayground: config.defaults?.apis?.disablePlayground,`, `    showVersionSelect: config.defaults?.apis?.showVersionSelect ?? "if-available",`, `    expandAllTags: config.defaults?.apis?.expandAllTags ?? true,`, `    transformExamples: config.defaults?.apis?.transformExamples,`, `    ...(apis[${apiIndex}].options ?? {}),`, `  },`, `  schemaImports: {`, ...Array.from(schemaMap.entries()).map(([key, schemaPath]) => `    "${key}": () => import("${schemaPath.replace(/\\/g, "/")}"),`), `  },`, "}));");
                     }
-                    // Generate API plugin code
-                    for (const apiConfig of apis) {
-                        if (apiConfig.type === "file") {
-                            if (!apiConfig.navigationId ||
-                                !versionMaps[apiConfig.navigationId]) {
-                                continue;
-                            }
-                            const schemas = processedSchemas[apiConfig.navigationId];
-                            if (!schemas?.length)
-                                continue;
-                            const tags = schemas
-                                .flatMap((schema) => getAllTags(schema.schema))
-                                .map(({ name }) => name)
-                                .filter((name, index, array) => array.indexOf(name) === index);
-                            code.push("configuredApiPlugins.push(openApiPlugin({", `  ...apiPluginOptions,`, `  type: "file",`, `  input: ${JSON.stringify(versionMaps[apiConfig.navigationId])},`, `  navigationId: ${JSON.stringify(apiConfig.navigationId)},`, `  tagPages: ${JSON.stringify(tags)},`, `  schemaImports: {`, ...Array.from(schemaMap.entries()).map(([key, schemaPath]) => `    "${key}": () => import("${schemaPath.replace(/\\/g, "/")}"),`), `  },`, "}));");
+                    else {
+                        code.push("configuredApiPlugins.push(openApiPlugin({", `  ...${JSON.stringify(apiConfig)},`, "  options: {", `    examplesLanguage: config.defaults?.apis?.examplesLanguage ?? config.defaults?.examplesLanguage,`, `    disablePlayground: config.defaults?.apis?.disablePlayground,`, `    showVersionSelect: config.defaults?.apis?.showVersionSelect ?? "if-available",`, `    expandAllTags: config.defaults?.apis?.expandAllTags ?? false,`, `    ...${JSON.stringify(apiConfig.options ?? {})},`, "  },", "}));");
+                    }
+                }
+                if (config.catalogs) {
+                    code.push('import { apiCatalogPlugin } from "zudoku/plugins/api-catalog";');
+                    const catalogs = Array.isArray(config.catalogs)
+                        ? config.catalogs
+                        : [config.catalogs];
+                    const categories = apis
+                        .flatMap((api) => api.categories ?? [])
+                        .reduce((acc, catalog) => {
+                        if (!acc.has(catalog.label)) {
+                            acc.set(catalog.label ?? "", new Set(catalog.tags));
                         }
-                        else {
-                            code.push(`configuredApiPlugins.push(openApiPlugin(${JSON.stringify({ ...apiConfig, ...apiPluginOptions })}));`);
+                        for (const tag of catalog.tags) {
+                            acc.get(catalog.label ?? "")?.add(tag);
                         }
-                    }
-                    if (config.catalogs) {
-                        const catalogs = Array.isArray(config.catalogs)
-                            ? config.catalogs
-                            : [config.catalogs];
-                        const categories = apis
-                            .flatMap((api) => api.categories ?? [])
-                            .reduce((acc, catalog) => {
-                            if (!acc.has(catalog.label)) {
-                                acc.set(catalog.label ?? "", new Set(catalog.tags));
-                            }
-                            for (const tag of catalog.tags) {
-                                acc.get(catalog.label ?? "")?.add(tag);
-                            }
-                            return acc;
-                        }, new Map());
-                        const categoryList = Array.from(categories.entries()).map(([label, tags]) => ({
-                            label,
-                            tags: Array.from(tags),
-                        }));
-                        for (let i = 0; i < catalogs.length; i++) {
-                            const catalog = catalogs[i];
-                            if (!catalog) {
-                                continue;
-                            }
-                            const apiCatalogConfig = {
-                                ...catalog,
-                                items: apiMetadata,
-                                label: catalog.label,
-                                categories: categoryList,
-                                filterCatalogItems: catalog.filterItems,
-                            };
-                            code.push(`configuredApiCatalogPlugins.push(apiCatalogPlugin({`, `  ...${JSON.stringify(apiCatalogConfig, null, 2)},`, `  filterCatalogItems: Array.isArray(config.catalogs)`, `    ? config.catalogs[${i}].filterItems`, `    : config.catalogs.filterItems,`, `}));`);
+                        return acc;
+                    }, new Map());
+                    const categoryList = Array.from(categories.entries()).map(([label, tags]) => ({
+                        label,
+                        tags: Array.from(tags),
+                    }));
+                    for (let i = 0; i < catalogs.length; i++) {
+                        const catalog = catalogs[i];
+                        if (!catalog) {
+                            continue;
                         }
+                        const apiCatalogConfig = {
+                            ...catalog,
+                            items: apiMetadata,
+                            label: catalog.label,
+                            categories: categoryList,
+                            filterCatalogItems: catalog.filterItems,
+                        };
+                        code.push(`configuredApiCatalogPlugins.push(apiCatalogPlugin({`, `  ...${JSON.stringify(apiCatalogConfig, null, 2)},`, `  filterCatalogItems: Array.isArray(config.catalogs)`, `    ? config.catalogs[${i}].filterItems`, `    : config.catalogs.filterItems,`, `}));`);
                     }
                 }
-                code.push(`export { configuredApiPlugins, configuredApiCatalogPlugins };`);
-                return code.join("\n");
             }
+            code.push(`export { configuredApiPlugins, configuredApiCatalogPlugins };`);
+            return code.join("\n");
         },
     };
 };