@btst/stack 1.5.2 → 1.7.0

package/src/api/index.ts

@@ -3,6 +3,7 @@ import type {
 	BackendLibConfig,
 	BackendLib,
 	PrefixedPluginRoutes,
+	BetterStackContext,
 } from "../types";
 import { defineDb } from "@btst/db";
 
@@ -45,9 +46,19 @@ export function betterStack<
 		betterDbSchema = betterDbSchema.use(plugin.dbPlugin);
 	}
 
+	// Create the adapter instance once
+	const adapterInstance = adapter(betterDbSchema);
+
+	// Create context for plugins that need access to all plugins (e.g., openAPI)
+	const context: BetterStackContext = {
+		plugins,
+		basePath,
+		adapter: adapterInstance,
+	};
+
 	for (const [pluginKey, plugin] of Object.entries(plugins)) {
-		// Pass the adapter directly to plugin routes
-		const pluginRoutes = plugin.routes(adapter(betterDbSchema));
+		// Pass both adapter and context to plugin routes
+		const pluginRoutes = plugin.routes(adapterInstance, context);
 
 		// Prefix route keys with plugin name to avoid collisions
 		for (const [routeKey, endpoint] of Object.entries(pluginRoutes)) {
@@ -72,4 +83,5 @@ export type {
 	BackendPlugin,
 	BackendLibConfig,
 	BackendLib,
+	BetterStackContext,
 } from "../types";

package/src/plugins/cms/api/plugin.ts

@@ -2,6 +2,10 @@ import type { Adapter } from "@btst/db";
 import { defineBackendPlugin } from "@btst/stack/plugins/api";
 import { createEndpoint } from "@btst/stack/plugins/api";
 import { z } from "zod";
+import {
+	zodToFormSchema,
+	formSchemaToZod,
+} from "@workspace/ui/lib/schema-converter";
 import { cmsSchema as dbSchema } from "../db";
 import type {
 	ContentType,
@@ -124,8 +128,9 @@ async function syncContentTypes(
 	config: CMSBackendConfig,
 ): Promise<void> {
 	for (const ct of config.contentTypes) {
-		// Convert Zod schema to JSON Schema - fieldType is now embedded via .meta()
-		const jsonSchema = JSON.stringify(z.toJSONSchema(ct.schema));
+		// Convert Zod schema to JSON Schema using zodToFormSchema
+		// This properly handles dates, date constraints, and steps metadata
+		const jsonSchema = JSON.stringify(zodToFormSchema(ct.schema));
 
 		const existing = await adapter.findOne<ContentType>({
 			model: "contentType",
@@ -184,11 +189,11 @@ async function syncContentTypes(
 
 /**
  * Get Zod schema for a content type from its JSON Schema
- * Uses Zod v4's native z.fromJSONSchema() for conversion
+ * Uses formSchemaToZod to properly handle dates, date constraints, and steps metadata
  */
 function getContentTypeZodSchema(contentType: ContentType): z.ZodTypeAny {
 	const jsonSchema = JSON.parse(contentType.jsonSchema);
-	return z.fromJSONSchema(jsonSchema);
+	return formSchemaToZod(jsonSchema);
 }
 
 /**

package/src/plugins/cms/client/components/forms/content-form.tsx

@@ -3,15 +3,13 @@
 import { useState, useMemo, useEffect } from "react";
 import { z } from "zod";
 import { toast } from "sonner";
-import AutoForm, { AutoFormSubmit } from "@workspace/ui/components/auto-form";
+import { SteppedAutoForm } from "@workspace/ui/components/auto-form/stepped-auto-form";
 import type {
 	FieldConfig,
 	AutoFormInputComponentProps,
 } from "@workspace/ui/components/auto-form/types";
-import {
-	buildFieldConfigFromJsonSchema as buildFieldConfigBase,
-	fromJSONSchemaWithDates,
-} from "@workspace/ui/components/auto-form/utils";
+import { buildFieldConfigFromJsonSchema as buildFieldConfigBase } from "@workspace/ui/components/auto-form/utils";
+import { formSchemaToZod } from "@workspace/ui/lib/schema-converter";
 import { Input } from "@workspace/ui/components/input";
 import { Label } from "@workspace/ui/components/label";
 import { Badge } from "@workspace/ui/components/badge";
@@ -168,11 +166,11 @@ export function ContentForm({
 		}
 	}, [contentType.jsonSchema]);
 
-	// Convert JSON Schema to Zod schema using fromJSONSchemaWithDates utility
+	// Convert JSON Schema to Zod schema using formSchemaToZod utility
 	// This properly handles date fields (format: "date-time") and min/max date constraints
 	const zodSchema = useMemo(() => {
 		try {
-			return fromJSONSchemaWithDates(jsonSchema);
+			return formSchemaToZod(jsonSchema);
 		} catch {
 			return z.object({});
 		}
@@ -264,30 +262,30 @@ export function ContentForm({
 			</div>
 
 			{/* Dynamic form from Zod schema */}
-			<AutoForm
+			{/* Uses SteppedAutoForm which automatically handles both single-step and multi-step content types */}
+			<SteppedAutoForm
 				formSchema={zodSchema as z.ZodObject<any, any>}
 				values={formData as any}
 				onValuesChange={handleValuesChange as any}
 				onSubmit={handleSubmit as any}
 				fieldConfig={fieldConfig as any}
+				isSubmitting={isSubmitting}
+				submitButtonText={
+					isSubmitting
+						? localization.CMS_STATUS_SAVING
+						: localization.CMS_BUTTON_SAVE
+				}
 			>
-				<div className="flex items-center gap-2 pt-4">
-					<AutoFormSubmit disabled={isSubmitting}>
-						{isSubmitting
-							? localization.CMS_STATUS_SAVING
-							: localization.CMS_BUTTON_SAVE}
-					</AutoFormSubmit>
-					{onCancel && (
-						<button
-							type="button"
-							onClick={onCancel}
-							className="px-4 py-2 text-sm text-muted-foreground hover:text-foreground"
-						>
-							{localization.CMS_BUTTON_CANCEL}
-						</button>
-					)}
-				</div>
-			</AutoForm>
+				{onCancel && (
+					<button
+						type="button"
+						onClick={onCancel}
+						className="px-4 py-2 text-sm text-muted-foreground hover:text-foreground"
+					>
+						{localization.CMS_BUTTON_CANCEL}
+					</button>
+				)}
+			</SteppedAutoForm>
 		</div>
 	);
 }

package/src/plugins/cms/client/index.ts

@@ -6,6 +6,17 @@ export type { CMSLocalization } from "./localization";
 // Re-export AutoFormInputComponentProps for custom field components
 export type { AutoFormInputComponentProps } from "@workspace/ui/components/auto-form/types";
 
+// Re-export schema converter utilities
+export {
+	zodToFormSchema,
+	formSchemaToZod,
+	hasSteps,
+	getSteps,
+	getStepGroupMap,
+	type FormStep,
+	type FormSchemaMetadata,
+} from "@workspace/ui/lib/schema-converter";
+
 // Export CMSFileUpload for consumers to use or extend
 export {
 	CMSFileUpload,

package/src/plugins/form-builder/api/index.ts

@@ -0,0 +1 @@
+export { formBuilderBackendPlugin, type FormBuilderApiRouter } from "./plugin";