@getstrata/cli 1.1.6 → 1.1.8

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @getstrata/cli changelog
 
+## 1.1.8
+
+- Exclude HTML and SPA routes from generated OpenAPI specs
+
+## Unreleased
+
+- `openapi:generate` (and validate/check) keep JSON API and health routes and drop HTML-only (`web` without `api`) and SPA-prefix paths instead of restamping the full hybrid table as API.
+
+## 1.1.7
+
+- Fix generated webhook SQL, billing hook, and hybrid SPA smoke
+
 ## 1.1.6
 
 - Add optional OIDC cookie login and loopback discovery

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getstrata/cli",
-  "version": "1.1.6",
+  "version": "1.1.8",
   "description": "Strata CLI: framework commands for Bun apps (dev, start, migrate, run)",
   "type": "module",
   "license": "MIT",

package/src/openapi.ts

@@ -1,22 +1,65 @@
 import { mkdir, readFile, writeFile } from "node:fs/promises";
 import { dirname, join } from "node:path";
 import { registerOpenApiRouteMap } from "@getstrata/bootstrap/buildModuleRoutes";
-import { routeRegistry } from "@getstrata/bootstrap/routeRegistry";
+import { type RegisteredRoute, routeRegistry } from "@getstrata/bootstrap/routeRegistry";
 import { generateOpenApiSpec, renderOpenApiDocument } from "@getstrata/core/openapi/generator";
 import { validateOpenApiSpec } from "@getstrata/core/openapi/validate";
+import { readSpaPrefix } from "@getstrata/core/runtime/frontendMode";
 
 type AppBootstrap = () => Promise<{ routes: Record<string, unknown> }>;
 
-function withoutSpaCatchAll(routes: Record<string, unknown>): Record<string, unknown> {
-  const next = { ...routes };
-  delete next["/*"];
-  return next;
+function isSpaDocumentedPath(path: string, spaPrefix: string): boolean {
+  return path === "/*" || path === spaPrefix || path.startsWith(`${spaPrefix}/`);
+}
+
+function isWebOnlyPath(metadata: RegisteredRoute[]): boolean {
+  return (
+    metadata.some((route) => route.middleware.includes("web")) &&
+    !metadata.some((route) => route.middleware.includes("api"))
+  );
+}
+
+function shouldKeepOpenApiPath(
+  path: string,
+  registered: RegisteredRoute[],
+  spaPrefix: string,
+): boolean {
+  if (isSpaDocumentedPath(path, spaPrefix)) {
+    return false;
+  }
+
+  const metadata = registered.filter((route) => route.path === path);
+  return !isWebOnlyPath(metadata);
 }
 
 async function registerAppOpenApiRoutes(bootstrap: AppBootstrap): Promise<void> {
+  routeRegistry.clear();
   const { routes } = await bootstrap();
+  const registered = routeRegistry.list();
+  const spaPrefix = readSpaPrefix();
+  const keepPaths = new Set<string>();
+
+  for (const path of Object.keys(routes)) {
+    if (shouldKeepOpenApiPath(path, registered, spaPrefix)) {
+      keepPaths.add(path);
+    }
+  }
+
+  const keptRegistered = registered.filter((route) => keepPaths.has(route.path));
+  const registeredKeepPaths = new Set(keptRegistered.map((route) => route.path));
+  const unregisteredKeepers: Record<string, unknown> = {};
+
+  for (const path of keepPaths) {
+    if (!registeredKeepPaths.has(path)) {
+      unregisteredKeepers[path] = routes[path];
+    }
+  }
+
   routeRegistry.clear();
-  registerOpenApiRouteMap(withoutSpaCatchAll(routes), ["global", "api"]);
+  for (const route of keptRegistered) {
+    routeRegistry.register(route);
+  }
+  registerOpenApiRouteMap(unregisteredKeepers, ["global", "api"]);
 }
 
 function createOpenApiGenerateCommand(bootstrap: AppBootstrap) {