zudoku 0.0.0-eff6f9b → 0.0.0-f5761c9

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

@@ -1,13 +1,13 @@
 import { j as e } from "./jsx-runtime-B6kdoens.js";
-import { S as x, R as f } from "./SlotletProvider-DJMaOUDs.js";
-import { u as g, a as d, I as j, S as v, b as w, c as b, d as k, e as K, f as m } from "./Input-B1kkVL1R.js";
+import { S as x, R as f } from "./SlotletProvider-CULK8zmk.js";
+import { u as g, a as d, I as j, S as v, b as w, c as b, d as k, e as K, f as m } from "./Input-DulGxZh-.js";
 import { a as N, L as u, O as I } from "./index-BG0g4WW0.js";
-import { u as h, a as E, b as S } from "./ZudokuContext-em1gHkIY.js";
-import { B as l, m as A } from "./index-BoXX7LeD.js";
-import { D as C } from "./DeveloperHint-FBb2uXJe.js";
+import { u as h, a as E, b as S } from "./ZudokuContext-cr-pTRY1.js";
+import { B as l, m as A } from "./index-BfA1oLPP.js";
+import { D as C } from "./DeveloperHint-CZ4VwuKw.js";
 import { RotateCwIcon as P, TrashIcon as D, EyeOffIcon as R, EyeIcon as q, CheckIcon as O, CopyIcon as z } from "lucide-react";
 import { useState as p } from "react";
-import { a as T } from "./Markdown-B4aR03g6.js";
+import { a as T } from "./Markdown-BUUIyZbc.js";
 function c(t, s) {
   if (t)
     return;

package/lib/zudoku.plugin-custom-page.js

@@ -1,5 +1,5 @@
 import { j as m } from "./jsx-runtime-B6kdoens.js";
-import { P as o } from "./Markdown-B4aR03g6.js";
+import { P as o } from "./Markdown-BUUIyZbc.js";
 const l = (s) => ({
   getRoutes: () => s.map(({ path: e, element: t }) => ({
     path: e,

package/lib/zudoku.plugin-markdown.js

@@ -6,7 +6,7 @@ const x = (t, e, n) => Object.entries(t).flatMap(([a, p]) => {
   return s ? {
     path: s,
     lazy: async () => {
-      const { MdxPage: i } = await import("./MdxPage-BcftTg5g.js"), { default: m, ...l } = await p();
+      const { MdxPage: i } = await import("./MdxPage-COBmXj_4.js"), { default: m, ...l } = await p();
       return {
         element: /* @__PURE__ */ u.jsx(
           i,

package/lib/zudoku.plugin-openapi.js

@@ -1,15 +1,16 @@
 import "./jsx-runtime-B6kdoens.js";
-import { o as s } from "./index-DIkaYL-l.js";
+import { o as u } from "./index-BuA1OA5H.js";
 import "./urql-YhcsXYy8.js";
-import "./ZudokuContext-em1gHkIY.js";
+import "./ZudokuContext-cr-pTRY1.js";
 import "lucide-react";
 import "zudoku/openapi-worker";
-import "./index-BoXX7LeD.js";
-import "./ErrorPage-knunPbKI.js";
-import "./Markdown-B4aR03g6.js";
+import "./index-BfA1oLPP.js";
+import "./ErrorPage-C5Pnyfbg.js";
+import "./Markdown-BUUIyZbc.js";
+import "./joinPath-B7kNnUX4.js";
 import "./router-D2p7Olpn.js";
 import "./index-BG0g4WW0.js";
 export {
-  s as openApiPlugin
+  u as openApiPlugin
 };
 //# sourceMappingURL=zudoku.plugin-openapi.js.map

package/lib/zudoku.plugin-openapi.js.map

@@ -1 +1 @@
-{"version":3,"file":"zudoku.plugin-openapi.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;"}
+{"version":3,"file":"zudoku.plugin-openapi.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zudoku",
-  "version": "0.0.0-eff6f9b",
+  "version": "0.0.0-f5761c9",
   "type": "module",
   "files": [
     "dist",
@@ -102,6 +102,7 @@
     "@radix-ui/react-select": "2.1.1",
     "@radix-ui/react-visually-hidden": "1.1.0",
     "@sentry/node": "8.11.0",
+    "@sindresorhus/slugify": "2.2.1",
     "@stefanprobst/rehype-extract-toc": "2.2.0",
     "@tailwindcss/typography": "0.5.13",
     "@tanstack/react-query": "5.50.1",
@@ -111,7 +112,7 @@
     "chokidar": "^3.6.0",
     "class-variance-authority": "0.7.0",
     "dotenv": "16.4.5",
-    "express": "4.19.2",
+    "express": "4.20.0",
     "glob": "^11.0.0",
     "graphql": "16.9.0",
     "graphql-type-json": "0.3.2",
@@ -147,7 +148,6 @@
     "rollup": "^4.21.2",
     "semver": "7.6.2",
     "sitemap": "^8.0.0",
-    "slugify": "1.6.6",
     "strip-ansi": "7.1.0",
     "tailwind-merge": "2.5.2",
     "tailwindcss": "3.4.4",

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

@@ -1,10 +1,13 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import SchemaBuilder from "@pothos/core";
+import {
+  slugifyWithCounter,
+  type CountableSlugify,
+} from "@sindresorhus/slugify";
 import { GraphQLJSON, GraphQLJSONObject } from "graphql-type-json";
 import { createYoga, type YogaServerOptions } from "graphql-yoga";
 import { LRUCache } from "lru-cache";
 import hashit from "object-hash";
-import slugify from "../../util/slugify.js";
 import {
   HttpMethods,
   validate,
@@ -35,7 +38,12 @@ type OperationLike = {
   path: string;
   method: string;
 };
-export const slugifyOperation = (operation: OperationLike, tag?: string) => {
+
+export const createOperationSlug = (
+  slugify: CountableSlugify,
+  operation: OperationLike,
+  tag?: string,
+) => {
   const summary =
     (operation.summary ?? "") +
     (operation.operationId
@@ -46,7 +54,6 @@ export const slugifyOperation = (operation: OperationLike, tag?: string) => {
   return slugify(
     (tag ? tag + "-" : "") +
       (summary || `${operation.method}-${operation.path}`),
-    { lower: true, trim: true },
   );
 };
 
@@ -88,6 +95,8 @@ const getAllTags = (schema: OpenAPIDocument): TagObject[] => {
 };
 
 const getAllOperations = (paths?: PathsObject, tag?: string) => {
+  const slugify = slugifyWithCounter();
+
   return Object.entries(paths ?? {}).flatMap(([path, value]) =>
     HttpMethods.flatMap((method) => {
       if (!value?.[method]) return [];
@@ -109,21 +118,20 @@ const getAllOperations = (paths?: PathsObject, tag?: string) => {
         ...operationParameters,
       ];
 
+      const slugData = {
+        summary: operation.summary,
+        operationId: operation.operationId,
+        path,
+        method,
+      };
+
       return {
         ...operation,
         method,
         path,
         parameters,
         tags: operation.tags ?? [],
-        slug: slugifyOperation(
-          {
-            summary: operation.summary,
-            operationId: operation.operationId,
-            path,
-            method,
-          },
-          tag,
-        ),
+        slug: createOperationSlug(slugify, slugData, tag),
       };
     }),
   );

package/src/lib/plugins/markdown/MdxPage.tsx

@@ -1,4 +1,5 @@
 import { useMDXComponents } from "@mdx-js/react";
+import slugify from "@sindresorhus/slugify";
 import { Helmet } from "@zudoku/react-helmet-async";
 import { type PropsWithChildren } from "react";
 import { Link } from "react-router-dom";
@@ -11,7 +12,6 @@ import {
 } from "../../components/navigation/utils.js";
 import type { MdxComponentsType } from "../../util/MdxComponents.js";
 import { cn } from "../../util/cn.js";
-import slugify from "../../util/slugify.js";
 import { Toc } from "./Toc.js";
 import { MarkdownPluginDefaultOptions, MDXImport } from "./index.js";
 
@@ -71,7 +71,7 @@ export const MdxPage = ({
         <header>
           {category && <CategoryHeading>{category}</CategoryHeading>}
           {title && (
-            <Heading level={1} id={slugify(title, { lower: true })}>
+            <Heading level={1} id={slugify(title)}>
               {title}
             </Heading>
           )}

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

@@ -16,6 +16,7 @@ import { ErrorPage } from "../../components/ErrorPage.js";
 import { ColorMap } from "../../components/navigation/SidebarBadge.js";
 import { SyntaxHighlight } from "../../components/SyntaxHighlight.js";
 import { Button } from "../../ui/Button.js";
+import { joinPath } from "../../util/joinPath.js";
 import { OasPluginConfig } from "./interfaces.js";
 import type { PlaygroundContentProps } from "./playground/Playground.js";
 import { PlaygroundDialog } from "./playground/PlaygroundDialog.js";
@@ -72,7 +73,7 @@ export type OpenApiPluginOptions = OasPluginConfig & InternalOasPluginConfig;
 export const openApiPlugin = (
   config: OpenApiPluginOptions,
 ): DevPortalPlugin => {
-  const basePath = "/reference";
+  const basePath = joinPath(config.navigationId ?? "/reference");
 
   const client = config.server
     ? new UrqlClient({

package/src/lib/plugins/openapi/playground/createUrl.ts

@@ -8,7 +8,12 @@ export const createUrl = (host: string, path: string, data: PlaygroundForm) => {
     return value ?? match;
   });
 
-  const url = new URL(filledPath, host);
+  // Ensure host ends with a slash and path doesn't start with one,
+  // so they form a correct URL, without overriding the host's path.
+  const url = new URL(
+    filledPath.replace(/^\//, ""),
+    host.endsWith("/") ? host : `${host}/`,
+  );
 
   data.queryParams
     .filter((param) => param.active)

package/dist/lib/util/slugify.d.ts

@@ -1,2 +0,0 @@
-import slugify from "slugify";
-export default slugify;

package/dist/lib/util/slugify.js

@@ -1,3 +0,0 @@
-import slugify from "slugify";
-export default slugify;
-//# sourceMappingURL=slugify.js.map

package/dist/lib/util/slugify.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"slugify.js","sourceRoot":"","sources":["../../../src/lib/util/slugify.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,eAAe,OAAO,CAAC"}