zudoku 0.0.0-fd8f8ad → 0.0.0-feda542

package/dist/vite/api/schema-codegen.test.js

@@ -0,0 +1,313 @@
+import { describe, expect, it } from "vitest";
+import { generateCode } from "./schema-codegen.js";
+const executeCode = (code) => {
+    const encodedCode = encodeURIComponent(code);
+    return import(`data:text/javascript,${encodedCode}`);
+};
+describe("Generate OpenAPI schema module", () => {
+    it("should handle basic schema refs", async () => {
+        const input = {
+            components: {
+                schemas: {
+                    Pet: {
+                        type: "object",
+                        properties: {
+                            name: { type: "string" },
+                        },
+                    },
+                    Error: {
+                        type: "object",
+                        properties: {
+                            code: { type: "integer" },
+                            message: { type: "string" },
+                        },
+                    },
+                },
+            },
+            paths: {
+                "/pets": {
+                    get: {
+                        responses: {
+                            "200": {
+                                content: {
+                                    "application/json": {
+                                        schema: { $ref: "#/components/schemas/Pet" },
+                                    },
+                                },
+                            },
+                            default: {
+                                content: {
+                                    "application/json": {
+                                        schema: { $ref: "#/components/schemas/Error" },
+                                    },
+                                },
+                            },
+                        },
+                    },
+                },
+            },
+        };
+        const { schema } = await executeCode(await generateCode(input));
+        const successSchema = schema.paths["/pets"].get.responses["200"].content["application/json"]
+            .schema;
+        const errorSchema = schema.paths["/pets"].get.responses["default"].content["application/json"]
+            .schema;
+        expect(successSchema).toStrictEqual(input.components.schemas.Pet);
+        expect(successSchema.__$ref).toStrictEqual("#/components/schemas/Pet");
+        expect(errorSchema).toStrictEqual(input.components.schemas.Error);
+        expect(errorSchema.__$ref).toStrictEqual("#/components/schemas/Error");
+    });
+    it("should handle circular refs", async () => {
+        const input = {
+            components: {
+                schemas: {
+                    Person: {
+                        type: "object",
+                        properties: {
+                            name: { type: "string" },
+                            bestFriend: { $ref: "#/components/schemas/Person" },
+                            pets: {
+                                type: "array",
+                                items: { $ref: "#/components/schemas/Pet" },
+                            },
+                        },
+                    },
+                    Pet: {
+                        type: "object",
+                        properties: {
+                            name: { type: "string" },
+                            owner: { $ref: "#/components/schemas/Person" },
+                        },
+                    },
+                },
+            },
+        };
+        const code = await generateCode(input);
+        const { schema } = await executeCode(code);
+        const person = schema.components.schemas.Person;
+        const pet = schema.components.schemas.Pet;
+        expect(person.properties.bestFriend).toStrictEqual(person);
+        expect(person.properties.pets.items).toStrictEqual(pet);
+        expect(pet.properties.owner).toStrictEqual(person);
+    });
+    it("should handle composition through refs", async () => {
+        const input = {
+            components: {
+                schemas: {
+                    Pet: {
+                        type: "object",
+                        allOf: [
+                            { $ref: "#/components/schemas/Animal" },
+                            { $ref: "#/components/schemas/Named" },
+                        ],
+                    },
+                    Animal: {
+                        type: "object",
+                        properties: {
+                            species: { type: "string" },
+                        },
+                    },
+                    Named: {
+                        type: "object",
+                        properties: {
+                            name: { type: "string" },
+                        },
+                    },
+                },
+            },
+        };
+        const { schema } = await executeCode(await generateCode(input));
+        const pet = schema.components.schemas.Pet;
+        expect(pet.allOf[0]).toStrictEqual(input.components.schemas.Animal);
+        expect(pet.allOf[1]).toStrictEqual(input.components.schemas.Named);
+    });
+    it("should handle discriminated unions with refs", async () => {
+        const input = {
+            components: {
+                schemas: {
+                    Pet: {
+                        oneOf: [
+                            { $ref: "#/components/schemas/Cat" },
+                            { $ref: "#/components/schemas/Dog" },
+                        ],
+                        discriminator: { propertyName: "petType" },
+                    },
+                    Cat: {
+                        type: "object",
+                        properties: {
+                            petType: { type: "string", enum: ["cat"] },
+                            purrs: { type: "boolean" },
+                        },
+                    },
+                    Dog: {
+                        type: "object",
+                        properties: {
+                            petType: { type: "string", enum: ["dog"] },
+                            barks: { type: "boolean" },
+                        },
+                    },
+                },
+            },
+        };
+        const { schema } = await executeCode(await generateCode(input));
+        const pet = schema.components.schemas.Pet;
+        expect(pet.oneOf[0]).toStrictEqual(input.components.schemas.Cat);
+        expect(pet.oneOf[1]).toStrictEqual(input.components.schemas.Dog);
+    });
+    it("should handle URL-encoded characters in references", async () => {
+        const input = {
+            components: { schemas: { "Type With Space": { type: "string" } } },
+            info: { schema: { $ref: "#/components/schemas/Type With Space" } },
+        };
+        const { schema } = await executeCode(await generateCode(input));
+        expect(schema.info.schema).toStrictEqual(input.components.schemas["Type With Space"]);
+    });
+    it("should generate proper slugs for tags and operations", async () => {
+        const input = {
+            openapi: "3.0.0",
+            info: {
+                title: "Test API",
+                version: "1.0.0",
+            },
+            tags: [{ name: "Pets & Animals" }, { name: "Admins & Users" }],
+            paths: {
+                "/pets": {
+                    tags: ["Pets & Animals"],
+                    get: {
+                        tags: ["Pets & Animals"],
+                        responses: { "200": { description: "OK" } },
+                    },
+                    post: {
+                        tags: ["Pets & Animals", "Some other tag"],
+                        responses: { "201": { description: "Created" } },
+                    },
+                    head: {
+                        tags: ["Pets & Animals"],
+                        responses: { "200": { description: "OK" } },
+                    },
+                },
+                "/users": {
+                    get: {
+                        tags: ["Admins & Users"],
+                        responses: { "200": { description: "OK" } },
+                    },
+                },
+            },
+        };
+        const { slugs } = await executeCode(await generateCode(input));
+        expect(slugs.operations).toMatchInlineSnapshot(`
+      {
+        "/pets-get": "get-pets",
+        "/pets-head": "head-pets",
+        "/pets-post": "post-pets",
+        "/users-get": "get-users",
+      }
+    `);
+        expect(slugs.tags).toMatchInlineSnapshot(`
+      {
+        "Admins & Users": "admins-and-users",
+        "Pets & Animals": "pets-and-animals",
+        "Some other tag": "some-other-tag",
+      }
+    `);
+    });
+    it("should generate correct code for circular refs", async () => {
+        const input = {
+            definitions: {
+                child: {
+                    title: "child",
+                    type: "object",
+                    properties: {
+                        name: { type: "string" },
+                        pet: { $ref: "#/definitions/pet" },
+                    },
+                },
+                // self-reference
+                thing: { $ref: "#/definitions/thing" },
+                pet: {
+                    title: "pet",
+                    type: "object",
+                    properties: {
+                        name: { type: "string" },
+                        age: { type: "number" },
+                        species: { type: "string", enum: ["cat", "dog", "bird", "fish"] },
+                    },
+                },
+            },
+        };
+        const code = await generateCode(input);
+        expect(code).toMatchInlineSnapshot(`
+      "const __refs = Array.from({ length: 2 }, () => ({}));
+      const __refMap = {
+        "#/definitions/pet": __refs[0],
+        "#/definitions/thing": __refs[1]
+      };
+      const __refMapPaths = Object.keys(__refMap);
+      Object.assign(__refs[0], {
+        "title": "pet",
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "age": {
+            "type": "number"
+          },
+          "species": {
+            "type": "string",
+            "enum": [
+              "cat",
+              "dog",
+              "bird",
+              "fish"
+            ]
+          }
+        }
+      });
+      Object.defineProperty(__refs[0], "__$ref", { value: __refMapPaths[0], enumerable: false });
+      Object.assign(__refs[1], __refMap["#/definitions/thing"]);
+      Object.defineProperty(__refs[1], "__$ref", { value: __refMapPaths[1], enumerable: false });
+      export const schema = {
+        "definitions": {
+          "child": {
+            "title": "child",
+            "type": "object",
+            "properties": {
+              "name": {
+                "type": "string"
+              },
+              "pet": __refMap["#/definitions/pet"]
+            }
+          },
+          "thing": __refMap["#/definitions/thing"],
+          "pet": {
+            "title": "pet",
+            "type": "object",
+            "properties": {
+              "name": {
+                "type": "string"
+              },
+              "age": {
+                "type": "number"
+              },
+              "species": {
+                "type": "string",
+                "enum": [
+                  "cat",
+                  "dog",
+                  "bird",
+                  "fish"
+                ]
+              }
+            }
+          }
+        }
+      };
+      export const slugs = {
+        operations: {},
+        tags: {},
+      };"
+    `);
+    });
+});
+//# sourceMappingURL=schema-codegen.test.js.map

package/dist/vite/api/schema-codegen.test.js.map

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

package/dist/vite/build.js

@@ -1,11 +1,14 @@
-import { writeFile } from "fs/promises";
+import { mkdir, rename, rm, writeFile } from "node:fs/promises";
 import path from "node:path";
 import { build as viteBuild } from "vite";
-import { joinPath } from "../lib/util/joinPath.js";
+import { findOutputPathOfServerConfig } from "../config/loader.js";
+import invariant from "../lib/util/invariant.js";
+import { joinUrl } from "../lib/util/joinUrl.js";
 import { getViteConfig, loadZudokuConfig } from "./config.js";
 import { getBuildHtml } from "./html.js";
 import { writeOutput } from "./output.js";
-import { prerender } from "./prerender.js";
+import { prerender } from "./prerender/prerender.js";
+const DIST_DIR = "dist";
 export async function runBuild(options) {
     // Shouldn't run in parallel because it's potentially racy
     const viteClientConfig = await getViteConfig(options.dir, {
@@ -19,39 +22,61 @@ export async function runBuild(options) {
     });
     // Don't run in parallel because it might overwrite itself
     const clientResult = await viteBuild(viteClientConfig);
-    await viteBuild(viteServerConfig);
+    const serverResult = await viteBuild({
+        ...viteServerConfig,
+        logLevel: "silent",
+    });
     if (Array.isArray(clientResult)) {
         throw new Error("Build failed");
     }
+    const { config } = await loadZudokuConfig({ mode: "production", command: "build" }, options.dir);
     if ("output" in clientResult) {
-        const jsEntry = clientResult.output.find((o) => "isEntry" in o && o.isEntry)?.fileName;
-        const cssEntry = clientResult.output.find((o) => o.fileName.endsWith(".css"))?.fileName;
+        const [jsEntry, cssEntry] = [
+            clientResult.output.find((o) => "isEntry" in o && o.isEntry)?.fileName,
+            clientResult.output.find((o) => o.fileName.endsWith(".css"))?.fileName,
+        ];
         if (!jsEntry || !cssEntry) {
             throw new Error("Build failed. No js or css assets found");
         }
         const html = getBuildHtml({
-            jsEntry: joinPath(viteClientConfig.base, jsEntry),
-            cssEntry: joinPath(viteClientConfig.base, cssEntry),
+            jsEntry: joinUrl(viteClientConfig.base, jsEntry),
+            cssEntry: joinUrl(viteClientConfig.base, cssEntry),
         });
+        const serverConfigFilename = findOutputPathOfServerConfig(serverResult);
+        invariant(viteClientConfig.build?.outDir, "Client build outDir is missing");
+        invariant(viteServerConfig.build?.outDir, "Server build outDir is missing");
         try {
-            const writtenFiles = await prerender({
+            const results = await prerender({
                 html,
                 dir: options.dir,
-                base: viteClientConfig.base,
+                basePath: config.basePath,
+                serverConfigFilename,
+                writeRedirects: process.env.VERCEL === undefined,
             });
-            if (writtenFiles.includes("index.html")) {
-                return;
+            const indexHtml = path.join(viteClientConfig.build.outDir, "index.html");
+            if (!results.find((r) => r.outputPath === indexHtml)) {
+                await writeFile(indexHtml, html, "utf-8");
+            }
+            // Delete the server build output directory because we don't need it anymore
+            await rm(viteServerConfig.build.outDir, { recursive: true, force: true });
+            if (process.env.VERCEL) {
+                await mkdir(path.join(options.dir, ".vercel/output/static"), {
+                    recursive: true,
+                });
+                await rename(path.join(options.dir, DIST_DIR), path.join(options.dir, ".vercel/output/static"));
             }
-            await writeFile(path.join(options.dir, "dist", viteClientConfig.base ?? "", "index.html"), html, "utf-8");
+            // Write the build output file
+            await writeOutput(options.dir, {
+                config,
+                redirects: results.flatMap((r) => r.redirect ?? []),
+            });
         }
         catch (e) {
             // dynamic imports in prerender swallow the stack trace, so we log it here
             // eslint-disable-next-line no-console
             console.error(e);
+            throw e;
         }
-        // Write the build output file
-        const config = await loadZudokuConfig(options.dir);
-        await writeOutput(options.dir, config);
         return;
     }
     throw new Error("Build failed");

package/dist/vite/build.js.map

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

package/dist/vite/config.d.ts

@@ -1,16 +1,15 @@
-import { ConfigWithMeta } from "@zudoku/config";
 import { type ConfigEnv, type InlineConfig } from "vite";
-import type { ZudokuConfig, ZudokuPluginOptions } from "../config/config.js";
+import type { LoadedConfig } from "../config/config.js";
 export type ZudokuConfigEnv = ConfigEnv & {
     mode: "development" | "production";
     forceReload?: boolean;
 };
-export type LoadedConfig = ConfigWithMeta<ZudokuConfig>;
-export declare function loadZudokuConfig(rootDir: string, forceReload?: boolean): Promise<LoadedConfig>;
+export declare const getStandaloneConfig: (rootDir: string) => LoadedConfig;
+export declare function loadZudokuConfig(configEnv: ConfigEnv, rootDir: string, forceReload?: boolean): Promise<{
+    config: LoadedConfig;
+    envPrefix: string[];
+    publicEnv: Record<string, string>;
+}>;
 export declare function getAppClientEntryPath(): string;
 export declare function getAppServerEntryPath(): string;
-export declare function getPluginOptions({ dir, mode, }: {
-    dir: string;
-    mode: ZudokuPluginOptions["mode"];
-}): ZudokuPluginOptions;
 export declare function getViteConfig(dir: string, configEnv: ZudokuConfigEnv, onConfigChange?: (config: LoadedConfig) => void): Promise<InlineConfig>;