zudoku 0.64.0 → 0.64.2

package/dist/lib/util/flattenAllOf.test.js

@@ -0,0 +1,532 @@
+import { describe, expect, it, vi } from "vitest";
+import { flattenAllOf, flattenAllOfProcessor } from "./flattenAllOf.js";
+import invariant from "./invariant.js";
+describe("flattenAllOf", () => {
+    it("should merge two simple schemas", () => {
+        const schema = {
+            allOf: [
+                { type: "object", properties: { id: { type: "string" } } },
+                { type: "object", properties: { name: { type: "string" } } },
+            ],
+        };
+        const result = flattenAllOf(schema);
+        expect(result).toMatchObject({
+            type: "object",
+            properties: {
+                id: { type: "string" },
+                name: { type: "string" },
+            },
+        });
+        expect(result).not.toHaveProperty("allOf");
+    });
+    it("should merge nested allOf chains", () => {
+        const schema = {
+            allOf: [
+                {
+                    allOf: [
+                        { type: "object", properties: { id: { type: "string" } } },
+                        { type: "object", properties: { name: { type: "string" } } },
+                    ],
+                },
+                { type: "object", properties: { email: { type: "string" } } },
+            ],
+        };
+        const result = flattenAllOf(schema);
+        expect(result).toMatchObject({
+            type: "object",
+            properties: {
+                id: { type: "string" },
+                name: { type: "string" },
+                email: { type: "string" },
+            },
+        });
+        expect(result).not.toHaveProperty("allOf");
+    });
+    it("should recursively flatten allOf in nested properties", () => {
+        const schema = {
+            type: "object",
+            properties: {
+                user: {
+                    allOf: [
+                        { type: "object", properties: { id: { type: "string" } } },
+                        { type: "object", properties: { name: { type: "string" } } },
+                    ],
+                },
+            },
+        };
+        const result = flattenAllOf(schema);
+        invariant(typeof result === "object" && result.properties, "Result is not a schema");
+        expect(result.properties?.user).toMatchObject({
+            type: "object",
+            properties: {
+                id: { type: "string" },
+                name: { type: "string" },
+            },
+        });
+        expect(result.properties.user).not.toHaveProperty("allOf");
+    });
+    it("should flatten allOf in array items", () => {
+        const schema = {
+            type: "array",
+            items: {
+                allOf: [
+                    { type: "object", properties: { id: { type: "string" } } },
+                    { type: "object", properties: { name: { type: "string" } } },
+                ],
+            },
+        };
+        const result = flattenAllOf(schema);
+        invariant(typeof result === "object" && result.items, "Result is not a schema");
+        expect(result.items).toMatchObject({
+            type: "object",
+            properties: {
+                id: { type: "string" },
+                name: { type: "string" },
+            },
+        });
+        expect(result.items).not.toHaveProperty("allOf");
+    });
+    it("should flatten allOf in tuple items", () => {
+        const schema = {
+            type: "array",
+            items: [
+                {
+                    allOf: [
+                        { type: "object", properties: { id: { type: "string" } } },
+                        { type: "object", properties: { name: { type: "string" } } },
+                    ],
+                },
+                { type: "string" },
+            ],
+        };
+        const result = flattenAllOf(schema);
+        invariant(typeof result === "object" && Array.isArray(result.items), "Result is not a schema");
+        expect(result.items[0]).toMatchObject({
+            type: "object",
+            properties: {
+                id: { type: "string" },
+                name: { type: "string" },
+            },
+        });
+        expect(result.items[0]).not.toHaveProperty("allOf");
+        expect(result.items[1]).toEqual({ type: "string" });
+    });
+    it("should flatten allOf in additionalProperties", () => {
+        const schema = {
+            type: "object",
+            additionalProperties: {
+                allOf: [
+                    { type: "object", properties: { id: { type: "string" } } },
+                    { type: "object", properties: { name: { type: "string" } } },
+                ],
+            },
+        };
+        const result = flattenAllOf(schema);
+        invariant(typeof result === "object" && result.additionalProperties, "Result is not a schema");
+        expect(result.additionalProperties).toMatchObject({
+            type: "object",
+            properties: {
+                id: { type: "string" },
+                name: { type: "string" },
+            },
+        });
+        expect(result.additionalProperties).not.toHaveProperty("allOf");
+    });
+    it("should flatten allOf within anyOf", () => {
+        const schema = {
+            anyOf: [
+                {
+                    allOf: [
+                        { type: "object", properties: { id: { type: "string" } } },
+                        { type: "object", properties: { name: { type: "string" } } },
+                    ],
+                },
+                { type: "string" },
+            ],
+        };
+        const result = flattenAllOf(schema);
+        invariant(typeof result === "object" && result.anyOf, "Result is not a schema");
+        expect(result.anyOf[0]).toMatchObject({
+            type: "object",
+            properties: {
+                id: { type: "string" },
+                name: { type: "string" },
+            },
+        });
+        expect(result.anyOf[0]).not.toHaveProperty("allOf");
+        expect(result.anyOf[1]).toEqual({ type: "string" });
+    });
+    it("should flatten allOf within oneOf", () => {
+        const schema = {
+            oneOf: [
+                {
+                    allOf: [
+                        { type: "object", properties: { id: { type: "string" } } },
+                        { type: "object", properties: { name: { type: "string" } } },
+                    ],
+                },
+                { type: "string" },
+            ],
+        };
+        const result = flattenAllOf(schema);
+        invariant(typeof result === "object" && result.oneOf, "Result is not a schema");
+        expect(result.oneOf[0]).toMatchObject({
+            type: "object",
+            properties: {
+                id: { type: "string" },
+                name: { type: "string" },
+            },
+        });
+        expect(result.oneOf[0]).not.toHaveProperty("allOf");
+        expect(result.oneOf[1]).toEqual({ type: "string" });
+    });
+    it("should handle schemas without allOf", () => {
+        const schema = { type: "string" };
+        expect(flattenAllOf(schema)).toEqual({ type: "string" });
+        const objectSchema = {
+            type: "object",
+            properties: { id: { type: "string" } },
+        };
+        expect(flattenAllOf(objectSchema)).toEqual(objectSchema);
+    });
+    it("should preserve description and other properties", () => {
+        const schema = {
+            description: "A test schema",
+            allOf: [
+                { type: "object", properties: { id: { type: "string" } } },
+                { type: "object", properties: { name: { type: "string" } } },
+            ],
+        };
+        const result = flattenAllOf(schema);
+        invariant(typeof result === "object", "Result is not a schema");
+        expect(result.description).toBe("A test schema");
+        expect(result.properties).toBeDefined();
+    });
+    it("should merge required arrays", () => {
+        const schema = {
+            allOf: [
+                {
+                    type: "object",
+                    properties: { id: { type: "string" } },
+                    required: ["id"],
+                },
+                {
+                    type: "object",
+                    properties: { name: { type: "string" } },
+                    required: ["name"],
+                },
+            ],
+        };
+        const result = flattenAllOf(schema);
+        invariant(typeof result === "object", "Result is not a schema");
+        expect(result.required).toEqual(expect.arrayContaining(["id", "name"]));
+    });
+    it("should handle complex nested structures", () => {
+        const schema = {
+            type: "object",
+            properties: {
+                booking: {
+                    allOf: [
+                        {
+                            allOf: [
+                                {
+                                    type: "object",
+                                    properties: { quoteId: { type: "string" } },
+                                },
+                                {
+                                    type: "object",
+                                    properties: { price: { type: "number" } },
+                                },
+                            ],
+                        },
+                        {
+                            type: "object",
+                            properties: { bookingId: { type: "string" } },
+                        },
+                    ],
+                },
+            },
+        };
+        const result = flattenAllOf(schema);
+        invariant(typeof result === "object" && result.properties, "Result is not a schema");
+        expect(result.properties.booking).toMatchObject({
+            type: "object",
+            properties: {
+                quoteId: { type: "string" },
+                price: { type: "number" },
+                bookingId: { type: "string" },
+            },
+        });
+        expect(result.properties.booking).not.toHaveProperty("allOf");
+    });
+});
+describe("flattenAllOf processor", () => {
+    it("should process an OpenAPI document and flatten allOf", async () => {
+        const schema = {
+            openapi: "3.0.0",
+            info: { title: "Test API", version: "1.0.0" },
+            paths: {
+                "/users": {
+                    get: {
+                        responses: {
+                            "200": {
+                                description: "Success",
+                                content: {
+                                    "application/json": {
+                                        schema: {
+                                            allOf: [
+                                                {
+                                                    type: "object",
+                                                    properties: { id: { type: "string" } },
+                                                },
+                                                {
+                                                    type: "object",
+                                                    properties: { name: { type: "string" } },
+                                                },
+                                            ],
+                                        },
+                                    },
+                                },
+                            },
+                        },
+                    },
+                },
+            },
+        };
+        const mockDereference = vi.fn().mockResolvedValue(schema);
+        const result = await flattenAllOfProcessor({
+            schema,
+            file: "/test/schema.json",
+            dereference: mockDereference,
+        });
+        expect(mockDereference).toHaveBeenCalledWith(schema);
+        const responseSchema = result.paths?.["/users"]?.get?.responses?.[200]?.content?.["application/json"]?.schema;
+        expect(responseSchema).toMatchObject({
+            type: "object",
+            properties: {
+                id: { type: "string" },
+                name: { type: "string" },
+            },
+        });
+        expect(responseSchema).not.toHaveProperty("allOf");
+    });
+    it("should process components.schemas and flatten allOf", async () => {
+        const schema = {
+            openapi: "3.0.0",
+            info: { title: "Test API", version: "1.0.0" },
+            paths: {},
+            components: {
+                schemas: {
+                    User: {
+                        allOf: [
+                            { type: "object", properties: { id: { type: "string" } } },
+                            { type: "object", properties: { name: { type: "string" } } },
+                        ],
+                    },
+                },
+            },
+        };
+        const mockDereference = vi.fn().mockResolvedValue(schema);
+        const result = await flattenAllOfProcessor({
+            schema,
+            file: "/test/schema.json",
+            dereference: mockDereference,
+        });
+        const userSchema = result.components?.schemas?.User;
+        expect(userSchema).toMatchObject({
+            type: "object",
+            properties: {
+                id: { type: "string" },
+                name: { type: "string" },
+            },
+        });
+        expect(userSchema).not.toHaveProperty("allOf");
+    });
+    it("should handle errors gracefully and return original schema", async () => {
+        const schema = {
+            openapi: "3.0.0",
+            info: { title: "Test API", version: "1.0.0" },
+            paths: {},
+        };
+        const mockDereference = vi
+            .fn()
+            .mockRejectedValue(new Error("Dereference failed"));
+        const consoleSpy = vi.spyOn(console, "warn").mockImplementation(() => { });
+        const result = await flattenAllOfProcessor({
+            schema,
+            file: "/test/schema.json",
+            dereference: mockDereference,
+        });
+        expect(result).toBe(schema);
+        expect(consoleSpy).toHaveBeenCalledWith(expect.stringContaining("Failed to flatten"));
+        consoleSpy.mockRestore();
+    });
+    it("should only flatten schema objects, not other OpenAPI structures", async () => {
+        const schema = {
+            openapi: "3.0.0",
+            info: { title: "Test API", version: "1.0.0" },
+            paths: {
+                "/users": {
+                    get: {
+                        operationId: "getUsers",
+                        tags: ["users"],
+                        responses: {
+                            "200": {
+                                description: "Success",
+                                content: {
+                                    "application/json": {
+                                        schema: {
+                                            allOf: [
+                                                {
+                                                    type: "object",
+                                                    properties: { id: { type: "string" } },
+                                                },
+                                                {
+                                                    type: "object",
+                                                    properties: { name: { type: "string" } },
+                                                },
+                                            ],
+                                        },
+                                    },
+                                },
+                            },
+                        },
+                    },
+                },
+            },
+        };
+        const mockDereference = vi.fn().mockResolvedValue(schema);
+        const result = await flattenAllOfProcessor({
+            schema,
+            file: "/test/schema.json",
+            dereference: mockDereference,
+        });
+        // Operation objects should not be flattened
+        const operation = result.paths?.["/users"]?.get;
+        expect(operation?.operationId).toBe("getUsers");
+        expect(operation?.tags).toEqual(["users"]);
+        // But schema objects should be flattened
+        const responseSchema = operation?.responses?.[200]?.content?.["application/json"]?.schema;
+        expect(responseSchema).not.toHaveProperty("allOf");
+    });
+    it("should handle deeply nested allOf in request bodies", async () => {
+        const schema = {
+            openapi: "3.0.0",
+            info: { title: "Test API", version: "1.0.0" },
+            paths: {
+                "/bookings": {
+                    post: {
+                        requestBody: {
+                            content: {
+                                "application/json": {
+                                    schema: {
+                                        allOf: [
+                                            {
+                                                allOf: [
+                                                    {
+                                                        type: "object",
+                                                        properties: { quoteId: { type: "string" } },
+                                                    },
+                                                    {
+                                                        type: "object",
+                                                        properties: { price: { type: "number" } },
+                                                    },
+                                                ],
+                                            },
+                                            {
+                                                type: "object",
+                                                properties: { bookingId: { type: "string" } },
+                                            },
+                                        ],
+                                    },
+                                },
+                            },
+                        },
+                        responses: {},
+                    },
+                },
+            },
+        };
+        const mockDereference = vi.fn().mockResolvedValue(schema);
+        const result = await flattenAllOfProcessor({
+            schema,
+            file: "/test/schema.json",
+            dereference: mockDereference,
+        });
+        const requestSchema = result.paths?.["/bookings"]?.post?.requestBody?.content?.["application/json"]?.schema;
+        expect(requestSchema).toMatchObject({
+            type: "object",
+            properties: {
+                quoteId: { type: "string" },
+                price: { type: "number" },
+                bookingId: { type: "string" },
+            },
+        });
+        expect(requestSchema).not.toHaveProperty("allOf");
+    });
+    it("should handle mixed allOf and oneOf combinations", async () => {
+        const schema = {
+            openapi: "3.0.0",
+            info: { title: "Test API", version: "1.0.0" },
+            paths: {},
+            components: {
+                schemas: {
+                    Container: {
+                        oneOf: [
+                            {
+                                allOf: [
+                                    {
+                                        type: "object",
+                                        properties: { type: { type: "string", const: "standard" } },
+                                    },
+                                    {
+                                        type: "object",
+                                        properties: { weight: { type: "number" } },
+                                    },
+                                ],
+                            },
+                            {
+                                allOf: [
+                                    {
+                                        type: "object",
+                                        properties: {
+                                            type: { type: "string", const: "refrigerated" },
+                                        },
+                                    },
+                                    {
+                                        type: "object",
+                                        properties: { temperature: { type: "number" } },
+                                    },
+                                ],
+                            },
+                        ],
+                    },
+                },
+            },
+        };
+        const mockDereference = vi.fn().mockResolvedValue(schema);
+        const result = await flattenAllOfProcessor({
+            schema,
+            file: "/test/schema.json",
+            dereference: mockDereference,
+        });
+        const containerSchema = result.components?.schemas?.Container;
+        expect(containerSchema?.oneOf?.[0]).toMatchObject({
+            type: "object",
+            properties: {
+                type: { type: "string", const: "standard" },
+                weight: { type: "number" },
+            },
+        });
+        expect(containerSchema?.oneOf?.[0]).not.toHaveProperty("allOf");
+        expect(containerSchema?.oneOf?.[1]).toMatchObject({
+            type: "object",
+            properties: {
+                type: { type: "string", const: "refrigerated" },
+                temperature: { type: "number" },
+            },
+        });
+        expect(containerSchema?.oneOf?.[1]).not.toHaveProperty("allOf");
+    });
+});
+//# sourceMappingURL=flattenAllOf.test.js.map

package/dist/lib/util/flattenAllOf.test.js.map

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

package/dist/vite/api/SchemaManager.js

@@ -3,9 +3,8 @@ import path from "node:path";
 import { $RefParser, } from "@apidevtools/json-schema-ref-parser";
 import { upgrade, validate } from "@scalar/openapi-parser";
 import slugify from "@sindresorhus/slugify";
-import { merge as mergeAllOf } from "allof-merge";
-import colors from "picocolors";
 import { ensureArray } from "../../lib/util/ensureArray.js";
+import { flattenAllOfProcessor } from "../../lib/util/flattenAllOf.js";
 import { generateCode } from "./schema-codegen.js";
 const FALLBACK_VERSION = "default";
 export class SchemaManager {
@@ -21,21 +20,7 @@ export class SchemaManager {
         this.config = config;
         this.processors = [
             ({ schema }) => upgrade(schema).specification,
-            ({ schema, file }) => {
-                try {
-                    return mergeAllOf(schema, {
-                        onMergeError: (message, path) => {
-                            throw new Error(`${message} at '${path.join(".")}'`);
-                        },
-                    });
-                }
-                catch (error) {
-                    // biome-ignore lint/suspicious/noConsole: Logging allowed here
-                    console.warn(colors.yellow(`Failed to merge \`allOf\` in ${file}: ` +
-                        (error instanceof Error ? error.message : error)));
-                    return schema; // Return original schema if merge fails
-                }
-            },
+            flattenAllOfProcessor,
             ...processors,
         ];
     }
@@ -82,7 +67,10 @@ export class SchemaManager {
             schema: await schema,
             file: filePath,
             dereference: (schema) => new $RefParser().dereference(schema, {
-                dereference: { preservedProperties: ["description", "summary"] },
+                dereference: {
+                    preservedProperties: ["description", "summary"],
+                    circular: "ignore",
+                },
             }),
         }), Promise.resolve(validatedSchema));
         const processedTime = Date.now();

package/dist/vite/api/SchemaManager.js.map

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

package/dist/vite/plugin-theme.js

@@ -1,5 +1,7 @@
 import path from "node:path";
+import { normalizeTheme } from "shiki";
 import { getCurrentConfig } from "../config/loader.js";
+import { defaultHighlightOptions } from "../lib/shiki.js";
 import { objectEntries } from "../lib/util/objectEntries.js";
 import { fetchShadcnRegistryItem, } from "./shadcn-registry.js";
 // biome-ignore format: for readability
@@ -233,7 +235,14 @@ export const viteThemePlugin = () => {
             if (fonts.families.serif) {
                 rootVars.push(`  --font-serif: ${fonts.families.serif};`);
             }
-            themeCss.push(":root {", ...rootVars, "}");
+            // Make shiki theme background colors available as CSS variables
+            const shikiThemes = config.syntaxHighlighting?.themes ?? defaultHighlightOptions.themes;
+            const [lightTheme, darkTheme] = (await Promise.all([
+                import(`@shikijs/themes/${shikiThemes.light}`).then((m) => m.default),
+                import(`@shikijs/themes/${shikiThemes.dark}`).then((m) => m.default),
+            ])).map(normalizeTheme);
+            rootVars.push(`  --shiki-light: ${lightTheme?.fg ?? "#000"};`, `  --shiki-dark: ${darkTheme?.fg ?? "#fff"};`, `  --shiki-light-bg: ${lightTheme?.bg ?? "#fff"};`, `  --shiki-dark-bg: ${darkTheme?.bg ?? "#000"};`);
+            themeCss.push(`:root {\n${rootVars.join("\n")}\n}`);
             return themeCss.join("\n");
         },
         // Handle static theme content in main.css