shokupan 0.10.4 → 0.10.5

package/dist/index.js

@@ -1083,7 +1083,7 @@ async function generateOpenApi(rootRouter, options = {}) {
     astRoutes = await getAstRoutes$1(applications);
   } catch (e) {
   }
-  const collect = (router, prefix = "", currentGroup = defaultTagGroup, defaultTag = defaultTagName, inheritedMiddleware = []) => {
+  const collect = (router, prefix = "", currentGroup = defaultTagGroup, defaultTag = defaultTagName, inheritedMiddleware = [], isRootLevel = true) => {
     let group = currentGroup;
     let tag = defaultTag;
     if (router.config?.group) group = router.config.group;
@@ -1091,7 +1091,7 @@ async function generateOpenApi(rootRouter, options = {}) {
       tag = router.config.name;
     } else {
       const mountPath = router[$mountPath];
-      if (mountPath && mountPath !== "/") {
+      if (isRootLevel && mountPath && mountPath !== "/") {
         const segments = mountPath.split("/").filter(Boolean);
         if (segments.length > 0) {
           const lastSegment = segments[segments.length - 1];
@@ -1298,7 +1298,7 @@ async function generateOpenApi(rootRouter, options = {}) {
       const cleanPrefix = prefix.endsWith("/") ? prefix.slice(0, -1) : prefix;
       const cleanMount = mountPath.startsWith("/") ? mountPath : "/" + mountPath;
       const nextPrefix = cleanPrefix + cleanMount || "/";
-      collect(child, nextPrefix, group, tag, [...inheritedMiddleware, ...routerMiddleware]);
+      collect(child, nextPrefix, group, tag, [...inheritedMiddleware, ...routerMiddleware], false);
     }
   };
   collect(rootRouter);
@@ -3550,7 +3550,25 @@ function ApiExplorerApp({ spec, asyncSpec, config }) {
     }
     return "Ungrouped";
   };
-  const createSubgroups = (routes, depth = 0) => {
+  const findCommonPrefix = (routes) => {
+    if (routes.length === 0) return [];
+    const allSegments = routes.map((r) => {
+      const cleaned = r.path.replace(/^\/|\/$/g, "");
+      return cleaned.split("/");
+    });
+    const minLength = Math.min(...allSegments.map((s) => s.length));
+    const commonPrefix = [];
+    for (let i = 0; i < minLength; i++) {
+      const segment = allSegments[0][i];
+      if (allSegments.every((segments) => segments[i] === segment)) {
+        commonPrefix.push(segment);
+      } else {
+        break;
+      }
+    }
+    return commonPrefix;
+  };
+  const createSubgroups = (routes, depth = 0, commonPrefixLength = 0) => {
     if (routes.length < 3 || depth > 5) {
       return routes.map((route) => ({
         name: route.path,
@@ -3561,7 +3579,8 @@ function ApiExplorerApp({ spec, asyncSpec, config }) {
     }
     const pathSegments = routes.map((r) => {
       const cleaned = r.path.replace(/^\/|\/$/g, "");
-      return cleaned.split("/");
+      const segments = cleaned.split("/");
+      return segments.slice(commonPrefixLength);
     });
     const prefixGroups = /* @__PURE__ */ new Map();
     const ungrouped = [];
@@ -3580,13 +3599,30 @@ function ApiExplorerApp({ spec, asyncSpec, config }) {
     const result = [];
     prefixGroups.forEach((groupRoutes, prefix) => {
       if (groupRoutes.length >= 3) {
-        const prefixName = prefix.split("/").pop() || prefix;
-        result.push({
-          name: prefixName,
-          type: "subgroup",
-          path: "/" + prefix,
-          children: createSubgroups(groupRoutes, depth + 1)
+        const nextSegments = /* @__PURE__ */ new Set();
+        groupRoutes.forEach((route, idx) => {
+          const routeIdx = routes.indexOf(route);
+          const segments = pathSegments[routeIdx];
+          if (segments.length > depth + 1) {
+            nextSegments.add(segments[depth + 1]);
+          }
+        });
+        const hasDivergingPaths = nextSegments.size >= 2;
+        const allTerminal = groupRoutes.every((route, idx) => {
+          const routeIdx = routes.indexOf(route);
+          return pathSegments[routeIdx].length === depth + 1;
         });
+        if (hasDivergingPaths || allTerminal) {
+          const prefixName = prefix.split("/").pop() || prefix;
+          result.push({
+            name: prefixName,
+            type: "subgroup",
+            path: "/" + prefix,
+            children: createSubgroups(groupRoutes, depth + 1, commonPrefixLength)
+          });
+        } else {
+          result.push(...createSubgroups(groupRoutes, depth + 1, commonPrefixLength));
+        }
       } else {
         ungrouped.push(...groupRoutes);
       }
@@ -3617,25 +3653,17 @@ function ApiExplorerApp({ spec, asyncSpec, config }) {
       addRoute(groupKey, route);
     });
   });
-  Object.entries(asyncSpec?.channels || {}).forEach(([name, ch]) => {
-    const operations = [];
-    if (ch.publish) operations.push({ method: "recv", op: ch.publish });
-    if (ch.subscribe) operations.push({ method: "send", op: ch.subscribe });
-    operations.forEach(({ method, op }) => {
-      if (!op.operationId) op.operationId = `${method}-${name.replace(/[^a-zA-Z0-9]/g, "-")}`;
-      const route = { method, path: name, op };
-      const source = op["x-shokupan-source"] || op["x-source-info"];
-      const groupKey = getGroupKey(op, source);
-      addRoute(groupKey, route);
-    });
-  });
   const hierarchicalGroups = Array.from(hierarchy.entries()).map(([name, routes]) => {
     routes.sort((a, b) => a.path.localeCompare(b.path));
-    const children = createSubgroups(routes);
+    const commonPrefix = findCommonPrefix(routes);
+    const commonPrefixPath = "/" + commonPrefix.join("/");
+    const children = createSubgroups(routes, 0, commonPrefix.length);
     return {
       name,
       type: "group",
-      children
+      children,
+      commonPrefixPath
+      // Store for display stripping
     };
   }).sort((a, b) => {
     if (a.name === "Ungrouped") return 1;
@@ -3674,11 +3702,25 @@ function ApiExplorerApp({ spec, asyncSpec, config }) {
   ] });
 }
 function Sidebar$1({ spec, hierarchicalGroups }) {
-  const renderNavNode = (node, depth = 0) => {
+  const stripPrefix = (path, prefix) => {
+    if (!prefix || prefix === "/") return path;
+    if (path.startsWith(prefix)) {
+      const stripped = path.substring(prefix.length);
+      return stripped || "/";
+    }
+    return path;
+  };
+  const formatAndHighlightPath = (path) => {
+    const converted = path.replace(/\{([^}]+)\}/g, ":$1");
+    return converted.replace(/:([a-zA-Z0-9_]+)/g, '<span class="param-highlight">:$1</span>');
+  };
+  const renderNavNode = (node, depth = 0, commonPrefix = "") => {
     if (node.type === "route") {
       const route = node.routes[0];
       const source = route.op["x-shokupan-source"] || route.op["x-source-info"];
       const isRuntime = route.op["x-source-info"]?.isRuntime;
+      const displayPath = stripPrefix(route.path, commonPrefix);
+      const highlightedPath = formatAndHighlightPath(displayPath);
       return /* @__PURE__ */ jsxs("div", { class: "nav-item-wrapper", style: `padding-left: ${depth * 12}px;`, children: [
         /* @__PURE__ */ jsxs(
           "a",
@@ -3689,7 +3731,7 @@ function Sidebar$1({ spec, hierarchicalGroups }) {
             title: route.path,
             children: [
               /* @__PURE__ */ jsx("span", { class: `badge badge-${route.method.toUpperCase()}`, children: route.method.toUpperCase() }),
-              /* @__PURE__ */ jsx("span", { class: "nav-label", children: node.name }),
+              /* @__PURE__ */ jsx("span", { class: "nav-label", dangerouslySetInnerHTML: { __html: highlightedPath } }),
               isRuntime && /* @__PURE__ */ jsx("span", { class: "nav-warning", title: "Static Analysis Failed", children: /* @__PURE__ */ jsxs("svg", { width: "12", height: "12", viewBox: "0 0 24 24", fill: "none", stroke: "currentColor", "stroke-width": "2", "stroke-linecap": "round", "stroke-linejoin": "round", children: [
                 /* @__PURE__ */ jsx("path", { d: "M10.29 3.86L1.82 18a2 2 0 0 0 1.71 3h16.94a2 2 0 0 0 1.71-3L13.71 3.86a2 2 0 0 0-3.42 0z" }),
                 /* @__PURE__ */ jsx("line", { x1: "12", y1: "9", x2: "12", y2: "13" }),
@@ -3718,7 +3760,7 @@ function Sidebar$1({ spec, hierarchicalGroups }) {
           /* @__PURE__ */ jsx("span", { class: "chevron", children: /* @__PURE__ */ jsx("svg", { width: "10", height: "10", viewBox: "0 0 24 24", fill: "none", stroke: "currentColor", "stroke-width": "2", "stroke-linecap": "round", "stroke-linejoin": "round", children: /* @__PURE__ */ jsx("polyline", { points: "9 18 15 12 9 6" }) }) }),
           /* @__PURE__ */ jsx("span", { children: node.name })
         ] }),
-        /* @__PURE__ */ jsx("div", { class: "nav-subgroup-items", children: node.children?.map((child) => renderNavNode(child, depth + 1)) })
+        /* @__PURE__ */ jsx("div", { class: "nav-subgroup-items", children: node.children?.map((child) => renderNavNode(child, depth + 1, commonPrefix)) })
       ] });
     }
   };
@@ -3736,7 +3778,7 @@ function Sidebar$1({ spec, hierarchicalGroups }) {
         " ",
         group.name
       ] }),
-      /* @__PURE__ */ jsx("div", { class: "nav-items", children: group.children?.map((child) => renderNavNode(child, 0)) })
+      /* @__PURE__ */ jsx("div", { class: "nav-items", children: group.children?.map((child) => renderNavNode(child, 0, group.commonPrefixPath || "")) })
     ] }, group.name)) })
   ] });
 }