@clarify-labs/cli 0.11.7 → 0.11.8

package/output/cli.cjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-const require_engine = require("./engine-BbQJ97Ed.cjs");
+const require_engine = require("./engine-pubnVIwZ.cjs");
 let node_path = require("node:path");
 let node_fs_promises = require("node:fs/promises");
 let node_fs = require("node:fs");

package/output/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { a as createClarifyTempDir, c as cliPackageVersion, i as findRouteConflicts, l as cliPackageVersionWithCaret, n as createClarifyEngine, o as deserializeSearchIndex, r as createClarifyRuntimeAliases, s as searchMcpIndex, u as createViteAdapter } from "./engine-Cc7Ve6o-.js";
+import { a as createClarifyTempDir, c as cliPackageVersion, i as findRouteConflicts, l as cliPackageVersionWithCaret, n as createClarifyEngine, o as deserializeSearchIndex, r as createClarifyRuntimeAliases, s as searchMcpIndex, u as createViteAdapter } from "./engine-B_0YOc2B.js";
 import { dirname, extname, isAbsolute, join, normalize, relative, resolve } from "node:path";
 import { lstat, mkdir, readFile, stat, writeFile } from "node:fs/promises";
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";

package/output/core/config/config-schema.d.ts

@@ -119,6 +119,12 @@ export declare const clarifyProjectConfigSchema: z.ZodObject<{
             maxWidth: z.ZodOptional<z.ZodString>;
         }, z.core.$strict>>;
     }, z.core.$strict>>;
+    layout: z.ZodOptional<z.ZodObject<{
+        tabs: z.ZodOptional<z.ZodEnum<{
+            subnav: "subnav";
+            navbar: "navbar";
+        }>>;
+    }, z.core.$strict>>;
     navigation: z.ZodOptional<z.ZodObject<{
         links: z.ZodOptional<z.ZodArray<z.ZodObject<{
             label: z.ZodUnion<readonly [z.ZodString, z.ZodRecord<z.ZodString, z.ZodString>]>;

package/output/core/runtime/ssg.d.ts

@@ -4,7 +4,7 @@ export { injectSSRIntoTemplate } from './html-template.js';
 export declare function readIndexHtml(outputDirectory: string): string | undefined;
 export declare function isNotFoundRoute(route: ContentRoute): boolean;
 export declare function routeOutputFiles(outputDirectory: string, route: ContentRoute): string[];
-export declare const SSR_ENTRY_CODE = "import { renderToHTML } from '@clarify-labs/renderer/server';\nimport { routes, navigation } from 'virtual:clarify/routes/server';\nimport { config } from 'virtual:clarify/config';\nimport { openApiSpecs } from 'virtual:clarify/openapi/server';\nimport { runtimeSlots } from 'virtual:clarify/slots';\n\nexport async function render(url) {\n  // Pre-resolve every slot component factory so renderToString can use\n  // them synchronously (renderToString has no Suspense support).\n  const entries = Object.values(runtimeSlots).flat()\n  await Promise.all(entries.map(async (entry) => {\n    const mod = await entry.loadComponent()\n    entry._resolved = mod.default\n  }))\n  return renderToHTML({ config, routes, navigation, openApiSpecs, runtimeSlots, url, themeEditor: config.theme.editor });\n}";
+export declare const SSR_ENTRY_CODE = "import { renderToHTML } from '@clarify-labs/renderer/server';\nimport { routes, navigation } from 'virtual:clarify/routes/server';\nimport { config, runtime } from 'virtual:clarify/config';\nimport { openApiSpecs } from 'virtual:clarify/openapi/server';\nimport { runtimeSlots } from 'virtual:clarify/slots';\n\nexport async function render(url) {\n  // Pre-resolve every slot component factory so renderToString can use\n  // them synchronously (renderToString has no Suspense support).\n  const entries = Object.values(runtimeSlots).flat()\n  await Promise.all(entries.map(async (entry) => {\n    const mod = await entry.loadComponent()\n    entry._resolved = mod.default\n  }))\n  return renderToHTML({ config, routes, navigation, openApiSpecs, runtimeSlots, url, themeEditor: runtime.themeEditor });\n}";
 export declare function createTempEntryFile(content: string): string;
 export declare function buildSSRBundle(root: string, ssrEntry: string, ssrOutDir: string, plugins: Plugin[]): Promise<void>;
 export declare function renderSSGRoutes(routes: ContentRoute[], contextOrConfig: ClarifyProjectContext | ResolvedProjectConfig, outputDirectory: string, ssrBundlePath: string): Promise<void>;

package/output/core/runtime/virtual-modules.d.ts

@@ -13,9 +13,6 @@ type BuildVirtualModulesArgs = {
     navigation: NavigationTree;
     themeEditor?: boolean;
 };
-type CreateClientEntryModuleOptions = {
-    themeEditor?: boolean;
-};
 export declare function resolveVirtualId(id: string): string;
 export declare function stripVirtualPrefix(id: string): string;
 export declare function virtualContentModuleId(route: MarkdownContentRoute): string;
@@ -28,9 +25,9 @@ export declare function virtualContentModuleId(route: MarkdownContentRoute): str
  * if the ID is not a Clarify virtual module.
  */
 export declare function resolveVirtualModuleId(id: string, modules: VirtualModules, routes: readonly ContentRoute[]): string | null;
-export declare function generateConfigModule(projectConfig: ResolvedProjectConfig, version?: string): string;
+export declare function generateConfigModule(projectConfig: ResolvedProjectConfig, version?: string, themeEditor?: boolean): string;
 export declare function generateRoutesModule(routes: ContentRoute[], navigation: NavigationTree, mode?: 'client' | 'server'): string;
-export declare function createClientEntryModule(options?: CreateClientEntryModuleOptions): string;
+export declare function createClientEntryModule(): string;
 /**
  * Collect every plugin's `slots` declarations into a single runtime registry
  * module. Component modules are exported as lazy import factories so the

package/output/{engine-Cc7Ve6o-.js → engine-B_0YOc2B.js}

@@ -983,6 +983,22 @@ var clarifyVariableValueSchema = z.lazy(() => z.union([
 	z.record(z.string(), clarifyVariableValueSchema)
 ]));
 var clarifyVariablesConfigSchema = z.record(z.string(), clarifyVariableValueSchema);
+var clarifySiteUrlSchema = z.string().superRefine((value, ctx) => {
+	let url;
+	try {
+		url = new URL(value);
+	} catch {
+		ctx.addIssue({
+			code: z.ZodIssueCode.custom,
+			message: "must be an absolute HTTP(S) origin"
+		});
+		return;
+	}
+	if (!["http:", "https:"].includes(url.protocol) || url.username || url.password || url.pathname !== "/" || url.search || url.hash) ctx.addIssue({
+		code: z.ZodIssueCode.custom,
+		message: "must be an HTTP(S) origin without a path, query, or hash; configure deployment subpaths with routePrefix"
+	});
+});
 var clarifyRepositoryConfigSchema = z.object({
 	url: z.string().optional(),
 	branch: z.string().optional(),
@@ -1050,6 +1066,7 @@ var clarifyThemeConfigSchema = z.object({
 	tokens: clarifyThemeTokensConfigSchema.optional(),
 	layout: clarifyThemeLayoutConfigSchema.optional()
 }).strict();
+var clarifyLayoutConfigSchema = z.object({ tabs: z.enum(["subnav", "navbar"]).optional() }).strict();
 function featureSchema(shape, defaults, enabledByDefault = true) {
 	const resolvedDefaults = {
 		enabled: enabledByDefault,
@@ -1073,13 +1090,14 @@ var clarifyFeaturesConfigSchema = z.object({
 var clarifyProjectConfigSchema = z.object({
 	title: z.string().optional(),
 	description: z.string().optional(),
-	siteUrl: z.string().optional(),
+	siteUrl: clarifySiteUrlSchema.optional(),
 	routePrefix: z.string().default("/"),
 	assetPrefix: z.string().optional(),
 	logo: clarifyLogoConfigSchema.optional(),
 	homeUrl: z.string().optional(),
 	favicon: clarifyFaviconConfigSchema.optional(),
 	theme: clarifyThemeConfigSchema.optional(),
+	layout: clarifyLayoutConfigSchema.optional(),
 	navigation: z.object({
 		links: z.array(clarifyNavbarLinkSchema).optional(),
 		tabs: clarifyTabsConfigSchema.optional()
@@ -1151,6 +1169,7 @@ function resolveProjectConfig(config = {}) {
 		homeUrl: config.homeUrl,
 		favicon: config.favicon,
 		theme: resolveThemeConfig(config.theme),
+		layout: { tabs: config.layout?.tabs ?? "subnav" },
 		navigation: config.navigation,
 		banner: config.banner,
 		footer: config.footer,
@@ -1295,7 +1314,7 @@ function resolveVirtualModuleId(id, modules, routes) {
 	if (route) return resolveVirtualId(route.module.pageVirtualModuleId);
 	return null;
 }
-function generateConfigModule(projectConfig, version) {
+function generateConfigModule(projectConfig, version, themeEditor = false) {
 	const runtimeConfig = {
 		title: projectConfig.title,
 		description: projectConfig.description,
@@ -1306,6 +1325,7 @@ function generateConfigModule(projectConfig, version) {
 		homeUrl: projectConfig.homeUrl,
 		favicon: projectConfig.favicon,
 		theme: projectConfig.theme,
+		layout: projectConfig.layout,
 		navigation: projectConfig.navigation,
 		banner: projectConfig.banner,
 		footer: projectConfig.footer,
@@ -1314,7 +1334,7 @@ function generateConfigModule(projectConfig, version) {
 		features: projectConfig.features
 	};
 	if (version) runtimeConfig.version = version;
-	return `export const config = ${JSON.stringify(runtimeConfig)};`;
+	return `export const config = ${JSON.stringify(runtimeConfig)};\nexport const runtime = ${JSON.stringify({ themeEditor })};`;
 }
 function moduleSpecifier(value) {
 	return JSON.stringify(value);
@@ -1353,15 +1373,15 @@ function generateRoutesModule(routes, navigation, mode = "client") {
 		return `  ${JSON.stringify(manifestEntry, null, 0).replace(`"${placeholder}"`, component).replace(/"([A-Za-z_$][\w$]*)":/g, "$1: ")}`;
 	}).join(",\n")}\n];\n\nexport const navigation = ${JSON.stringify(navigation, null, 2)};\n`;
 }
-function createClientEntryModule(options = {}) {
+function createClientEntryModule() {
 	return `
 import '@clarify-labs/renderer/style.css';
 import { render } from '@clarify-labs/renderer/client';
 import { routes, navigation } from '${VIRTUAL_ROUTES}';
-import { config } from '${VIRTUAL_CONFIG}';
+import { config, runtime } from '${VIRTUAL_CONFIG}';
 import { openApiSpecs } from '${VIRTUAL_OPENAPI}';
 import { runtimeSlots } from '${VIRTUAL_SLOTS}';
-const renderOptions = { config, routes, navigation, openApiSpecs, runtimeSlots, themeEditor: ${JSON.stringify(options.themeEditor ?? false)} };
+const renderOptions = { config, routes, navigation, openApiSpecs, runtimeSlots, themeEditor: runtime.themeEditor };
 render(renderOptions);
 if (import.meta.hot) {
   import.meta.hot.accept('${VIRTUAL_ROUTES}', (mod) => {
@@ -1413,9 +1433,9 @@ export default createContentDiagnosticComponent(contentDiagnostic);
 }
 function buildVirtualModules(args) {
 	const modules = /* @__PURE__ */ new Map();
-	const clientEntryModule = createClientEntryModule({ themeEditor: args.themeEditor });
+	const clientEntryModule = createClientEntryModule();
 	const allPlugins = [...args.plugins ?? []];
-	modules.set(VIRTUAL_CONFIG, generateConfigModule(args.projectConfig, args.version));
+	modules.set(VIRTUAL_CONFIG, generateConfigModule(args.projectConfig, args.version, args.themeEditor));
 	modules.set(VIRTUAL_ROUTES, generateRoutesModule(args.routes, args.navigation, "client"));
 	modules.set(VIRTUAL_SERVER_ROUTES, generateRoutesModule(args.routes, args.navigation, "server"));
 	modules.set(VIRTUAL_SLOTS, createRuntimeSlotsModule(allPlugins, args.generateOptions.projectRoot));
@@ -1660,7 +1680,7 @@ function createViteAdapter(engine) {
 }
 var cliPackageVersion = {
 	name: "@clarify-labs/cli",
-	version: "0.11.7",
+	version: "0.11.8",
 	license: "AGPL-3.0-only",
 	type: "module",
 	repository: {
@@ -1868,7 +1888,8 @@ function normalizeRoutePrefix$1(routePrefix) {
 function resolveContentArtifactPath(url, projectConfig) {
 	const requestPath = url?.split("?")[0] ?? "";
 	const basePath = normalizeRoutePrefix$1(projectConfig.routePrefix);
-	return basePath && requestPath.startsWith(basePath) ? requestPath.slice(basePath.length) || "/" : requestPath;
+	const hasBasePath = requestPath === basePath || requestPath.startsWith(`${basePath}/`);
+	return basePath && hasBasePath ? requestPath.slice(basePath.length) || "/" : requestPath;
 }
 function resolveContentArtifactType(route) {
 	return route.kind === "openapi" ? "application/json; charset=utf-8" : "text/markdown; charset=utf-8";
@@ -2768,15 +2789,16 @@ function createOpenAPIPlugin() {
 	return {
 		name: "clarify:openapi",
 		hooks: {
-			"routes:discover": (input, ctx) => ({
+			"routes:discover": (input, ctx) => ctx.projectConfig.features.openapi.enabled ? {
 				...input,
 				routes: [...input.routes, ...discoverOpenAPIRoutes(input.contentRoot, ctx.projectConfig.locales)]
-			}),
+			} : input,
 			"routes:discovered": async (routes, ctx) => {
+				if (!ctx.projectConfig.features.openapi.enabled) return state.enrichRoutes(routes.filter((route) => route.kind !== "openapi"), ctx);
 				const expandedRoutes = expandConfiguredOpenAPIRoutes(routes, ctx.projectConfig);
 				return state.enrichRoutes(expandedRoutes, ctx);
 			},
-			"modules:before": (modules, ctx) => state.contributeModules(modules, ctx.routes)
+			"modules:before": (modules, ctx) => state.contributeModules(modules, ctx.projectConfig.features.openapi.enabled ? ctx.routes : ctx.routes.filter((route) => route.kind !== "openapi"))
 		}
 	};
 }
@@ -3538,7 +3560,7 @@ function routeOutputFiles(outputDirectory, route) {
 }
 var SSR_ENTRY_CODE = `import { renderToHTML } from '@clarify-labs/renderer/server';
 import { routes, navigation } from 'virtual:clarify/routes/server';
-import { config } from 'virtual:clarify/config';
+import { config, runtime } from 'virtual:clarify/config';
 import { openApiSpecs } from 'virtual:clarify/openapi/server';
 import { runtimeSlots } from 'virtual:clarify/slots';
 
@@ -3550,7 +3572,7 @@ export async function render(url) {
     const mod = await entry.loadComponent()
     entry._resolved = mod.default
   }))
-  return renderToHTML({ config, routes, navigation, openApiSpecs, runtimeSlots, url, themeEditor: config.theme.editor });
+  return renderToHTML({ config, routes, navigation, openApiSpecs, runtimeSlots, url, themeEditor: runtime.themeEditor });
 }`;
 function createTempEntryFile(content) {
 	const entryPath = join(createClarifyTempDir("ssr"), "entry-server.ts");
@@ -3999,4 +4021,4 @@ function createClarifyEngine(options = {}) {
 //#endregion
 export { createClarifyTempDir as a, cliPackageVersion as c, defineConfig as d, findRouteConflicts as i, cliPackageVersionWithCaret as l, createClarifyEngine as n, deserializeSearchIndex as o, createClarifyRuntimeAliases as r, searchMcpIndex as s, ClarifyEngine as t, createViteAdapter as u };
 
-//# sourceMappingURL=engine-Cc7Ve6o-.js.map
+//# sourceMappingURL=engine-B_0YOc2B.js.map