zudoku 0.41.2 → 0.41.4

package/lib/zudoku.components.js

@@ -3,7 +3,7 @@ import "./index-DwT-v3zK.js";
 import "./chunk-KNED5TY2-BUPjb3LQ.js";
 import "./hook-pPrHCB6G.js";
 import "./SlotletProvider-p4XaFFOh.js";
-import { e as d, f as k, n as l, B as S, C as h, j as B, l as c, H as E, d as H, L, M, g as R, R as Z, S as f, k as g, i as y, Z as A, a as b, h as j, c as v, m as w, b as x } from "./index-BPmAnNGI.js";
+import { e as d, f as k, n as l, B as S, C as h, j as B, l as c, H as E, d as H, L, M, g as R, R as Z, S as f, k as g, i as y, Z as A, a as b, h as j, c as v, m as w, b as x } from "./index-DMYbZ3i6.js";
 import "./ui/Button.js";
 import "./ui/Callout.js";
 import "./ClientOnly-E7hGysn1.js";

package/lib/zudoku.plugin-api-catalog.js

@@ -3,7 +3,7 @@ import { s as h } from "./index-LNp6rxyU.js";
 import { d as b, m as x } from "./chunk-KNED5TY2-BUPjb3LQ.js";
 import { u as j, d as y, f as p } from "./hook-pPrHCB6G.js";
 import { H as v } from "./RouteGuard-BZ_VsiXc.js";
-import { L as N } from "./index-BPmAnNGI.js";
+import { L as N } from "./index-DMYbZ3i6.js";
 import { H as S, M as w } from "./Markdown-DqDbGCj2.js";
 const H = ({
   items: r,

package/lib/zudoku.plugin-markdown.js

@@ -53,7 +53,7 @@ const P = (e) => ({
         const u = {
           path: r,
           lazy: async () => {
-            const { MdxPage: p } = await import("./MdxPage-B7MyVLV5.js"), { default: f, ...l } = await i();
+            const { MdxPage: p } = await import("./MdxPage-OSMru6r8.js"), { default: f, ...l } = await i();
             return {
               element: /* @__PURE__ */ d.jsx(
                 p,

package/lib/zudoku.plugin-openapi.js

@@ -3,7 +3,7 @@ import "lucide-react";
 import "./chunk-KNED5TY2-BUPjb3LQ.js";
 import "./hook-pPrHCB6G.js";
 import "./ui/Button.js";
-import { U as a, o as e } from "./index-pAogBEk7.js";
+import { U as a, o as e } from "./index-DNFEg0uU.js";
 export {
   a as UNTAGGED_PATH,
   e as openApiPlugin

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zudoku",
-  "version": "0.41.2",
+  "version": "0.41.4",
   "type": "module",
   "homepage": "https://zudoku.dev",
   "repository": {

package/src/app/main.tsx

@@ -129,9 +129,13 @@ export const getRoutesByConfig = (config: ZudokuConfig): RouteObject[] => {
     {
       element: (
         <Zudoku {...options}>
-          {import.meta.env.IS_ZUPLO && import.meta.env.ZUPLO_BUILD_ID && (
-            <BuildCheck buildId={import.meta.env.ZUPLO_BUILD_ID} />
-          )}
+          <BuildCheck
+            buildId={
+              import.meta.env.IS_ZUPLO && import.meta.env.ZUPLO_BUILD_ID
+                ? import.meta.env.ZUPLO_BUILD_ID
+                : undefined
+            }
+          />
           <Layout />
         </Zudoku>
       ),

package/src/lib/components/BuildCheck.tsx

@@ -1,7 +1,14 @@
 import { useQuery } from "@tanstack/react-query";
 import { CircleFadingArrowUpIcon, LoaderCircleIcon } from "lucide-react";
+import { z } from "zod";
 import { Button } from "../ui/Button.js";
 
+const BuildStatusSchema = z.object({
+  buildId: z.string(),
+  timestamp: z.string(),
+  status: z.enum(["in-progress", "completed", "failed"]),
+});
+
 export const BuildCheck = ({
   buildId,
   endpoint = "/__zuplo/docs",
@@ -13,19 +20,25 @@ export const BuildCheck = ({
     queryKey: ["zuplo-build-check", buildId, endpoint],
     refetchInterval: 2000,
     enabled: !!buildId,
+    retry: false,
     queryFn: () =>
-      fetch(endpoint).then((res) => res.json()) as Promise<{
-        buildId: string;
-        timestamp: string;
-        status: "in-progress" | "completed" | "failed";
-      }>,
+      fetch(endpoint, { signal: AbortSignal.timeout(2000) })
+        .then((res) => {
+          if (!res.ok) throw new Error("Failed to fetch build status");
+          return res.json();
+        })
+        .then((data) => BuildStatusSchema.parse(data)),
   });
 
-  if (buildStatusQuery.data?.buildId === buildId) {
+  if (
+    buildStatusQuery.isError ||
+    !buildStatusQuery.data ||
+    buildStatusQuery.data.buildId === buildId
+  ) {
     return null;
   }
 
-  const isCompleted = buildStatusQuery.data?.status === "completed";
+  const isCompleted = buildStatusQuery.data.status === "completed";
 
   return (
     <div className="fixed flex flex-col gap-3 p-4 rounded-xl w-96 border z-20 bg-background left-0 right-0 top-4 mx-auto shadow-lg">

package/src/lib/oas/parser/index.ts

@@ -1,6 +1,7 @@
 import { GraphQLError } from "graphql/error/index.js";
 import { OpenAPIV3, type OpenAPIV3_1 } from "openapi-types";
 import { dereference, type JSONSchema } from "./dereference/index.js";
+import { upgradeSchema } from "./upgrade/index.js";
 
 // Must be an interface (not a type) to allow merging with OpenAPI types with index signatures
 interface WithRef {
@@ -94,10 +95,8 @@ export const validate = async (schemaInput: unknown) => {
     throw new GraphQLError("OpenAPI version is not defined");
   }
 
-  const { upgrade } = await import("@scalar/openapi-parser");
-
   const dereferenced = await dereference(schema);
-  const upgraded = upgrade(dereferenced);
+  const upgraded = upgradeSchema(dereferenced);
 
-  return upgraded.specification;
+  return upgraded;
 };

package/src/lib/oas/parser/upgrade/index.ts

@@ -0,0 +1,103 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import { type RecordAny, traverse } from "../../../util/traverse.js";
+import type { OpenAPIDocument } from "../index.js";
+/**
+ * Upgrade from OpenAPI 3.0.x to 3.1.0
+ *
+ * Taken from https://github.com/scalar/openapi-parser/blob/main/packages/openapi-parser/src/utils/upgradeFromThreeToThreeOne.ts
+ * https://www.openapis.org/blog/2021/02/16/migrating-from-openapi-3-0-to-3-1-0
+ */
+
+export const upgradeSchema = (schema: RecordAny): OpenAPIDocument => {
+  if (schema.openapi?.startsWith("3.0")) {
+    schema.openapi = "3.1.0";
+  }
+
+  schema = traverse(schema, (sub) => {
+    if (typeof sub.type !== "undefined" && sub.nullable === true) {
+      sub.type = ["null", sub.type];
+      delete sub.nullable;
+    }
+
+    return sub;
+  });
+
+  schema = traverse(schema, (sub) => {
+    if (sub.exclusiveMinimum === true) {
+      sub.exclusiveMinimum = sub.minimum;
+      delete sub.minimum;
+    } else if (sub.exclusiveMinimum === false) {
+      delete sub.exclusiveMinimum;
+    }
+
+    if (sub.exclusiveMaximum === true) {
+      sub.exclusiveMaximum = sub.maximum;
+      delete sub.maximum;
+    } else if (sub.exclusiveMaximum === false) {
+      delete sub.exclusiveMaximum;
+    }
+
+    return sub;
+  });
+
+  schema = traverse(schema, (sub) => {
+    // may be null or undefined
+    if (sub.example) {
+      const isExampleObject =
+        typeof sub.example === "object" &&
+        (sub.example.summary !== undefined ||
+          sub.example.description !== undefined ||
+          sub.example.value !== undefined ||
+          sub.example.externalValue !== undefined);
+
+      const exampleValue = isExampleObject
+        ? sub.example
+        : { value: sub.example };
+
+      if (!sub.examples) {
+        sub.examples = { default: exampleValue };
+      } else {
+        sub.examples = {
+          default: exampleValue,
+          ...sub.examples,
+        };
+      }
+      delete sub.example;
+    }
+    return sub;
+  });
+
+  schema = traverse(schema, (sub) => {
+    if (sub.type === "object" && sub.properties !== undefined) {
+      for (const [, value] of Object.entries(sub.properties)) {
+        const v = (value ?? {}) as RecordAny;
+        if (v.type === "string" && v.format === "binary") {
+          v.contentEncoding = "application/octet-stream";
+          delete v.format;
+        }
+      }
+    }
+    return sub;
+  });
+
+  schema = traverse(schema, (sub) => {
+    if (sub.type === "string" && sub.format === "binary") {
+      return undefined as any;
+    }
+
+    return sub;
+  });
+
+  schema = traverse(schema, (sub) => {
+    if (sub.type === "string" && sub.format === "base64") {
+      return {
+        type: "string",
+        contentEncoding: "base64",
+      };
+    }
+
+    return sub;
+  });
+
+  return schema as OpenAPIDocument;
+};