zudoku 0.71.4 → 0.71.6

package/dist/cli/cli.js

@@ -3794,7 +3794,7 @@ import {
 // package.json
 var package_default = {
   name: "zudoku",
-  version: "0.71.3",
+  version: "0.71.5",
   type: "module",
   sideEffects: [
     "**/*.css",
@@ -5263,25 +5263,28 @@ var flattenAllOfProcessor = async ({ schema: schema2, file }) => {
     const parser = new $RefParser();
     await parser.resolve(schema2);
     const $refs = parser.$refs;
-    const flattened = traverse(schema2, (spec) => {
+    const resolved = traverse(schema2, (spec) => {
+      if (!spec || typeof spec !== "object" || Array.isArray(spec) || !("allOf" in spec) || !Array.isArray(spec.allOf)) {
+        return spec;
+      }
+      const resolvedAllOf = spec.allOf.map((item) => {
+        if (item && typeof item === "object" && "$ref" in item && typeof item.$ref === "string") {
+          try {
+            return $refs.get(item.$ref) ?? item;
+          } catch {
+            return item;
+          }
+        }
+        return item;
+      });
+      return { ...spec, allOf: resolvedAllOf };
+    });
+    const flattened = traverse(resolved, (spec) => {
       if (!spec || typeof spec !== "object" || Array.isArray(spec)) {
         return spec;
       }
       const isSchemaObject = "type" in spec || "properties" in spec || "allOf" in spec || "anyOf" in spec || "oneOf" in spec;
       if (!isSchemaObject) return spec;
-      if ("allOf" in spec && Array.isArray(spec.allOf)) {
-        const resolvedAllOf = spec.allOf.map((item) => {
-          if (item && typeof item === "object" && "$ref" in item && typeof item.$ref === "string") {
-            try {
-              return $refs.get(item.$ref) ?? item;
-            } catch {
-              return item;
-            }
-          }
-          return item;
-        });
-        return flattenAllOf({ ...spec, allOf: resolvedAllOf });
-      }
       return flattenAllOf(spec);
     });
     return flattened;

package/dist/declarations/app/utils/createRedirectRoutes.d.ts

@@ -0,0 +1,3 @@
+import { type RouteObject } from "react-router";
+import type { ZudokuRedirect } from "../../config/validators/validate.js";
+export declare const createRedirectRoutes: (redirects?: ZudokuRedirect[]) => RouteObject[];

package/dist/declarations/index.d.ts

@@ -10,4 +10,5 @@ export type { MDXImport } from "./lib/plugins/markdown/index.js";
 export { defaultLanguages } from "./lib/shiki.js";
 export { cn } from "./lib/ui/util.js";
 export { joinUrl } from "./lib/util/joinUrl.js";
+export { type ProblemJson, throwIfProblemJson, } from "./lib/util/problemJson.js";
 export type { MdxComponentsType } from "./lib/util/MdxComponents.js";

package/dist/declarations/lib/testing/index.d.ts

@@ -1,4 +1,5 @@
 import { type QueryKey } from "@tanstack/react-query";
+import type { ZudokuRedirect } from "../../config/validators/validate.js";
 import type { ZudokuContextOptions } from "../core/ZudokuContext.js";
 type QueryData = {
     queryKey: QueryKey;
@@ -9,6 +10,7 @@ type StaticZudokuProps = ZudokuContextOptions & {
     queryData?: QueryData[];
     env?: Record<string, string>;
     isAuthenticated?: boolean;
+    redirects?: ZudokuRedirect[];
 };
-declare const StaticZudoku: ({ path, queryData, env, isAuthenticated, ...options }: StaticZudokuProps) => import("react/jsx-runtime").JSX.Element;
+declare const StaticZudoku: ({ path, queryData, env, isAuthenticated, redirects, ...options }: StaticZudokuProps) => import("react/jsx-runtime").JSX.Element;
 export { StaticZudoku, type StaticZudokuProps, type QueryData };

package/dist/declarations/lib/util/problemJson.d.ts

@@ -0,0 +1,10 @@
+export type ProblemJson = {
+    type: string;
+    title?: string;
+    status?: number;
+    detail?: string;
+    instance?: string;
+    [extension: string]: unknown;
+};
+export declare const getProblemJson: (response: Response) => Promise<ProblemJson | undefined>;
+export declare const throwIfProblemJson: (response: Response) => Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zudoku",
-  "version": "0.71.4",
+  "version": "0.71.6",
   "type": "module",
   "sideEffects": [
     "**/*.css",

package/src/app/main.tsx

@@ -29,7 +29,7 @@ import type { ZudokuContextOptions } from "../lib/core/ZudokuContext.js";
 import { RouterError } from "../lib/errors/RouterError.js";
 import { ZuploEnv } from "./env.js";
 import { processRoutes } from "./processRoutes.js";
-import { createRedirectLoader } from "./utils/createRedirectLoader.js";
+import { createRedirectRoutes } from "./utils/createRedirectRoutes.js";
 
 export const shikiReady: Promise<HighlighterCore> =
   import("../lib/shiki.js").then(async ({ highlighterPromise }) => {
@@ -121,6 +121,7 @@ export const getRoutesByConfig = (config: ZudokuConfig): RouteObject[] => {
   );
 
   return [
+    ...createRedirectRoutes(config.redirects),
     {
       element: (
         <Zudoku {...options} env={import.meta.env}>
@@ -132,7 +133,6 @@ export const getRoutesByConfig = (config: ZudokuConfig): RouteObject[] => {
         </Zudoku>
       ),
       hydrateFallbackElement: <div>Loading...</div>,
-      loader: createRedirectLoader(config.redirects, config.basePath),
       children: [
         {
           element: (

package/src/app/utils/createRedirectRoutes.ts

@@ -0,0 +1,11 @@
+import { redirect, type RouteObject } from "react-router";
+import type { ZudokuRedirect } from "../../config/validators/validate.js";
+import { joinUrl } from "../../lib/util/joinUrl.js";
+
+export const createRedirectRoutes = (
+  redirects?: ZudokuRedirect[],
+): RouteObject[] =>
+  (redirects ?? []).map((r) => ({
+    path: joinUrl(r.from),
+    loader: () => redirect(r.to, 301),
+  }));

package/src/index.ts

@@ -26,4 +26,8 @@ export type { MDXImport } from "./lib/plugins/markdown/index.js";
 export { defaultLanguages } from "./lib/shiki.js";
 export { cn } from "./lib/ui/util.js";
 export { joinUrl } from "./lib/util/joinUrl.js";
+export {
+  type ProblemJson,
+  throwIfProblemJson,
+} from "./lib/util/problemJson.js";
 export type { MdxComponentsType } from "./lib/util/MdxComponents.js";

package/src/lib/plugins/api-keys/index.tsx

@@ -10,6 +10,7 @@ import type {
 import type { ZudokuContext } from "../../core/ZudokuContext.js";
 import invariant from "../../util/invariant.js";
 import { joinUrl } from "../../util/joinUrl.js";
+import { throwIfProblemJson } from "../../util/problemJson.js";
 import { SettingsApiKeys } from "./SettingsApiKeys.js";
 
 const DEFAULT_GATEWAY_URL = "https://api.zuploedge.com";
@@ -70,24 +71,6 @@ export interface ApiConsumer {
   key?: ApiKey;
 }
 
-const parseJsonSafe = async (response: Response) => {
-  try {
-    return await response.json();
-  } catch {
-    return;
-  }
-};
-
-const throwIfProblemJson = async (response: Response) => {
-  const contentType = response.headers.get("content-type");
-  if (!response.ok && contentType?.includes("application/problem+json")) {
-    const data = await parseJsonSafe(response);
-    if (data.type && data.title) {
-      throw new Error(data.detail ?? data.title);
-    }
-  }
-};
-
 const developerHintOptions = {
   developerHint:
     "This project is not linked to a Zuplo deployment. Run `zuplo link` to get started with API Keys.",

package/src/lib/plugins/openapi/SchemaInfo.tsx

@@ -260,7 +260,11 @@ export const SchemaInfo = () => {
                           {tag.description && (
                             <ItemDescription asChild>
                               <Markdown
-                                components={{ p: ({ children }) => children }}
+                                components={{
+                                  // Because the description is wrapped in a <p> and a <Link> already
+                                  p: ({ children }) => children,
+                                  a: (props) => <span {...props} />,
+                                }}
                                 content={tag.description}
                                 className="prose-sm text-pretty"
                               />

package/src/lib/testing/index.tsx

@@ -5,6 +5,8 @@ import {
 } from "@tanstack/react-query";
 import { HelmetProvider } from "@zudoku/react-helmet-async";
 import { createMemoryRouter, Outlet, RouterProvider } from "react-router";
+import { createRedirectRoutes } from "../../app/utils/createRedirectRoutes.js";
+import type { ZudokuRedirect } from "../../config/validators/validate.js";
 import type { AuthenticationPlugin } from "../authentication/authentication.js";
 import { useAuthState } from "../authentication/state.js";
 import { RenderContext } from "../components/context/RenderContext.js";
@@ -26,6 +28,7 @@ type StaticZudokuProps = ZudokuContextOptions & {
   queryData?: QueryData[];
   env?: Record<string, string>;
   isAuthenticated?: boolean;
+  redirects?: ZudokuRedirect[];
 };
 
 const getRoutesByOptions = (options: ZudokuContextOptions) => {
@@ -52,6 +55,7 @@ const StaticZudoku = ({
   queryData,
   env = {},
   isAuthenticated,
+  redirects,
   ...options
 }: StaticZudokuProps) => {
   if (isAuthenticated) {
@@ -93,6 +97,7 @@ const StaticZudoku = ({
   const routes = getRoutesByOptions(options);
   const router = createMemoryRouter(
     [
+      ...createRedirectRoutes(redirects),
       {
         element: (
           <Zudoku {...options} env={env}>

package/src/lib/util/flattenAllOfProcessor.ts

@@ -11,7 +11,42 @@ export const flattenAllOfProcessor: Processor = async ({ schema, file }) => {
     await parser.resolve(schema);
     const $refs = parser.$refs;
 
-    const flattened = traverse(schema, (spec) => {
+    // Pre-resolve all $refs inside allOf items throughout the schema before
+    // flattening. flattenAllOf recurses internally into oneOf/anyOf/properties
+    // without going through $ref resolution, so we must ensure all allOf items
+    // are resolved upfront. This prevents stale $ref keys from being merged
+    // into parent schemas when they point to paths removed during flattening.
+    const resolved = traverse(schema, (spec) => {
+      if (
+        !spec ||
+        typeof spec !== "object" ||
+        Array.isArray(spec) ||
+        !("allOf" in spec) ||
+        !Array.isArray(spec.allOf)
+      ) {
+        return spec;
+      }
+
+      const resolvedAllOf = spec.allOf.map((item) => {
+        if (
+          item &&
+          typeof item === "object" &&
+          "$ref" in item &&
+          typeof item.$ref === "string"
+        ) {
+          try {
+            return $refs.get(item.$ref) ?? item;
+          } catch {
+            return item;
+          }
+        }
+        return item;
+      });
+
+      return { ...spec, allOf: resolvedAllOf };
+    }) as OpenAPIDocument;
+
+    const flattened = traverse(resolved, (spec) => {
       if (!spec || typeof spec !== "object" || Array.isArray(spec)) {
         return spec;
       }
@@ -25,25 +60,6 @@ export const flattenAllOfProcessor: Processor = async ({ schema, file }) => {
 
       if (!isSchemaObject) return spec;
 
-      if ("allOf" in spec && Array.isArray(spec.allOf)) {
-        const resolvedAllOf = spec.allOf.map((item) => {
-          if (
-            item &&
-            typeof item === "object" &&
-            "$ref" in item &&
-            typeof item.$ref === "string"
-          ) {
-            try {
-              return $refs.get(item.$ref) ?? item;
-            } catch {
-              return item;
-            }
-          }
-          return item;
-        });
-        return flattenAllOf({ ...spec, allOf: resolvedAllOf }) as RecordAny;
-      }
-
       return flattenAllOf(spec) as RecordAny;
     }) as OpenAPIDocument;
 

package/dist/declarations/app/utils/createRedirectLoader.d.ts

@@ -1,4 +0,0 @@
-import type { ZudokuRedirect } from "../../config/validators/validate.js";
-export declare const createRedirectLoader: (redirects?: ZudokuRedirect[], basePath?: string) => (({ request }: {
-    request: Request;
-}) => Response | null) | undefined;

package/src/app/utils/createRedirectLoader.ts

@@ -1,21 +0,0 @@
-import { redirect } from "react-router";
-import type { ZudokuRedirect } from "../../config/validators/validate.js";
-import { joinUrl } from "../../lib/util/joinUrl.js";
-
-export const createRedirectLoader = (
-  redirects?: ZudokuRedirect[],
-  basePath?: string,
-) => {
-  if (!redirects) return undefined;
-
-  const prefix = basePath ? joinUrl(basePath) : "";
-  const map = new Map(redirects.map((r) => [joinUrl(r.from), r.to]));
-  return ({ request }: { request: Request }) => {
-    let pathname = joinUrl(new URL(request.url).pathname);
-    if (prefix && pathname.startsWith(prefix)) {
-      pathname = pathname.slice(prefix.length) || "/";
-    }
-    const to = map.get(joinUrl(pathname));
-    return to ? redirect(to, 301) : null;
-  };
-};