@btst/stack 1.5.1 → 1.5.2

package/dist/plugins/cms/client/index.d.mts

@@ -3,10 +3,9 @@ import * as react from 'react';
 import { ComponentType } from 'react';
 import * as _btst_yar from '@btst/yar';
 import { QueryClient } from '@tanstack/react-query';
-import { a as AutoFormInputComponentProps } from '../../../shared/stack.NZJogTUn.mjs';
+import { ControllerRenderProps, FieldValues } from 'react-hook-form';
+import * as zod from 'zod';
 import * as react_jsx_runtime from 'react/jsx-runtime';
-import 'react-hook-form';
-import 'zod';
 
 /**
  * Context passed to loader hooks
@@ -239,6 +238,115 @@ declare const CMS_LOCALIZATION: {
 };
 type CMSLocalization = typeof CMS_LOCALIZATION;
 
+declare function AutoFormCheckbox({ label, isRequired, field, fieldConfigItem, fieldProps, }: AutoFormInputComponentProps): react_jsx_runtime.JSX.Element;
+
+declare function AutoFormDate({ label, isRequired, field, fieldConfigItem, fieldProps, zodItem, }: AutoFormInputComponentProps): react_jsx_runtime.JSX.Element;
+
+declare function AutoFormEnum({ label, isRequired, field, fieldConfigItem, zodItem, fieldProps, }: AutoFormInputComponentProps): react_jsx_runtime.JSX.Element;
+
+declare function AutoFormInput({ label, isRequired, fieldConfigItem, fieldProps, }: AutoFormInputComponentProps): react_jsx_runtime.JSX.Element;
+
+declare function AutoFormNumber({ label, isRequired, fieldConfigItem, fieldProps, }: AutoFormInputComponentProps): react_jsx_runtime.JSX.Element;
+
+declare function AutoFormRadioGroup({ label, isRequired, field, zodItem, fieldProps, fieldConfigItem, }: AutoFormInputComponentProps): react_jsx_runtime.JSX.Element;
+
+declare function AutoFormSwitch({ label, isRequired, field, fieldConfigItem, fieldProps, }: AutoFormInputComponentProps): react_jsx_runtime.JSX.Element;
+
+declare function AutoFormTextarea({ label, isRequired, fieldConfigItem, fieldProps, }: AutoFormInputComponentProps): react_jsx_runtime.JSX.Element;
+
+declare const INPUT_COMPONENTS: {
+    checkbox: typeof AutoFormCheckbox;
+    date: typeof AutoFormDate;
+    select: typeof AutoFormEnum;
+    radio: typeof AutoFormRadioGroup;
+    switch: typeof AutoFormSwitch;
+    textarea: typeof AutoFormTextarea;
+    number: typeof AutoFormNumber;
+    fallback: typeof AutoFormInput;
+};
+
+/**
+ * Common input props shared by all field types.
+ */
+interface BaseInputProps {
+    /** Whether the field is disabled */
+    disabled?: boolean;
+    /** Whether the field is read-only */
+    readOnly?: boolean;
+    /** Whether the field is required */
+    required?: boolean;
+    /** Whether to show the label (auto-form specific) */
+    showLabel?: boolean;
+}
+/**
+ * Generic input props that accept any field type.
+ * Use this when the backing type is not known at compile time.
+ *
+ * This is the catch-all type used for runtime flexibility.
+ */
+interface SerializableInputProps extends BaseInputProps {
+    placeholder?: string;
+    type?: string;
+    defaultValue?: unknown;
+    min?: number | string;
+    max?: number | string;
+    step?: number | string;
+    minLength?: number;
+    maxLength?: number;
+    pattern?: string;
+    autoComplete?: string;
+    /** Allow additional props for extensibility */
+    [key: string]: unknown;
+}
+
+/**
+ * Input props for form fields.
+ *
+ * This is the runtime type that accepts any input props.
+ * For type-safe props, use the discriminated types:
+ * - StringInputProps for text inputs
+ * - NumberInputProps for number inputs
+ * - BooleanInputProps for checkboxes/switches
+ * - DateInputProps for date pickers
+ * - EnumInputProps for selects/radios
+ */
+type FieldInputProps = SerializableInputProps & Omit<React.InputHTMLAttributes<HTMLInputElement>, keyof SerializableInputProps> & Omit<React.TextareaHTMLAttributes<HTMLTextAreaElement>, keyof SerializableInputProps>;
+/**
+ * Configuration for a single field in AutoForm.
+ *
+ * Note: This type is designed to align with form-builder's FormBuilderFieldProps
+ * so that JSON Schema properties can be easily converted to field configs.
+ */
+type FieldConfigItem = {
+    /** Description text or React node */
+    description?: React.ReactNode;
+    /** Input props passed to the field component */
+    inputProps?: FieldInputProps;
+    /** Display label */
+    label?: string;
+    /** Field type override - built-in type or custom component */
+    fieldType?: keyof typeof INPUT_COMPONENTS | React.FC<AutoFormInputComponentProps>;
+    /** Wrapper component for custom field layout */
+    renderParent?: (props: {
+        children: React.ReactNode;
+    }) => React.ReactElement | null;
+    /** Display order for field ordering */
+    order?: number;
+};
+/**
+ * A FormInput component can handle a specific Zod type (e.g. "ZodBoolean")
+ */
+type AutoFormInputComponentProps = {
+    zodInputProps: React.InputHTMLAttributes<HTMLInputElement>;
+    field: ControllerRenderProps<FieldValues, any>;
+    fieldConfigItem: FieldConfigItem;
+    label: string;
+    isRequired: boolean;
+    fieldProps: any;
+    zodItem: zod.ZodType;
+    className?: string;
+};
+
 /**
  * Context passed to lifecycle hooks
  */
@@ -405,5 +513,5 @@ interface CMSFileUploadProps extends AutoFormInputComponentProps {
  */
 declare function CMSFileUpload({ label, isRequired, fieldConfigItem, fieldProps, field, uploadImage, }: CMSFileUploadProps): react_jsx_runtime.JSX.Element;
 
-export { AutoFormInputComponentProps, CMSFileUpload, cmsClientPlugin };
-export type { CMSClientConfig, CMSClientHooks, CMSFileUploadProps, CMSLocalization, CMSPluginOverrides, LoaderContext, RouteContext };
+export { CMSFileUpload, cmsClientPlugin };
+export type { AutoFormInputComponentProps, CMSClientConfig, CMSClientHooks, CMSFileUploadProps, CMSLocalization, CMSPluginOverrides, LoaderContext, RouteContext };

package/dist/plugins/cms/client/index.d.ts

@@ -3,10 +3,9 @@ import * as react from 'react';
 import { ComponentType } from 'react';
 import * as _btst_yar from '@btst/yar';
 import { QueryClient } from '@tanstack/react-query';
-import { a as AutoFormInputComponentProps } from '../../../shared/stack.NZJogTUn.js';
+import { ControllerRenderProps, FieldValues } from 'react-hook-form';
+import * as zod from 'zod';
 import * as react_jsx_runtime from 'react/jsx-runtime';
-import 'react-hook-form';
-import 'zod';
 
 /**
  * Context passed to loader hooks
@@ -239,6 +238,115 @@ declare const CMS_LOCALIZATION: {
 };
 type CMSLocalization = typeof CMS_LOCALIZATION;
 
+declare function AutoFormCheckbox({ label, isRequired, field, fieldConfigItem, fieldProps, }: AutoFormInputComponentProps): react_jsx_runtime.JSX.Element;
+
+declare function AutoFormDate({ label, isRequired, field, fieldConfigItem, fieldProps, zodItem, }: AutoFormInputComponentProps): react_jsx_runtime.JSX.Element;
+
+declare function AutoFormEnum({ label, isRequired, field, fieldConfigItem, zodItem, fieldProps, }: AutoFormInputComponentProps): react_jsx_runtime.JSX.Element;
+
+declare function AutoFormInput({ label, isRequired, fieldConfigItem, fieldProps, }: AutoFormInputComponentProps): react_jsx_runtime.JSX.Element;
+
+declare function AutoFormNumber({ label, isRequired, fieldConfigItem, fieldProps, }: AutoFormInputComponentProps): react_jsx_runtime.JSX.Element;
+
+declare function AutoFormRadioGroup({ label, isRequired, field, zodItem, fieldProps, fieldConfigItem, }: AutoFormInputComponentProps): react_jsx_runtime.JSX.Element;
+
+declare function AutoFormSwitch({ label, isRequired, field, fieldConfigItem, fieldProps, }: AutoFormInputComponentProps): react_jsx_runtime.JSX.Element;
+
+declare function AutoFormTextarea({ label, isRequired, fieldConfigItem, fieldProps, }: AutoFormInputComponentProps): react_jsx_runtime.JSX.Element;
+
+declare const INPUT_COMPONENTS: {
+    checkbox: typeof AutoFormCheckbox;
+    date: typeof AutoFormDate;
+    select: typeof AutoFormEnum;
+    radio: typeof AutoFormRadioGroup;
+    switch: typeof AutoFormSwitch;
+    textarea: typeof AutoFormTextarea;
+    number: typeof AutoFormNumber;
+    fallback: typeof AutoFormInput;
+};
+
+/**
+ * Common input props shared by all field types.
+ */
+interface BaseInputProps {
+    /** Whether the field is disabled */
+    disabled?: boolean;
+    /** Whether the field is read-only */
+    readOnly?: boolean;
+    /** Whether the field is required */
+    required?: boolean;
+    /** Whether to show the label (auto-form specific) */
+    showLabel?: boolean;
+}
+/**
+ * Generic input props that accept any field type.
+ * Use this when the backing type is not known at compile time.
+ *
+ * This is the catch-all type used for runtime flexibility.
+ */
+interface SerializableInputProps extends BaseInputProps {
+    placeholder?: string;
+    type?: string;
+    defaultValue?: unknown;
+    min?: number | string;
+    max?: number | string;
+    step?: number | string;
+    minLength?: number;
+    maxLength?: number;
+    pattern?: string;
+    autoComplete?: string;
+    /** Allow additional props for extensibility */
+    [key: string]: unknown;
+}
+
+/**
+ * Input props for form fields.
+ *
+ * This is the runtime type that accepts any input props.
+ * For type-safe props, use the discriminated types:
+ * - StringInputProps for text inputs
+ * - NumberInputProps for number inputs
+ * - BooleanInputProps for checkboxes/switches
+ * - DateInputProps for date pickers
+ * - EnumInputProps for selects/radios
+ */
+type FieldInputProps = SerializableInputProps & Omit<React.InputHTMLAttributes<HTMLInputElement>, keyof SerializableInputProps> & Omit<React.TextareaHTMLAttributes<HTMLTextAreaElement>, keyof SerializableInputProps>;
+/**
+ * Configuration for a single field in AutoForm.
+ *
+ * Note: This type is designed to align with form-builder's FormBuilderFieldProps
+ * so that JSON Schema properties can be easily converted to field configs.
+ */
+type FieldConfigItem = {
+    /** Description text or React node */
+    description?: React.ReactNode;
+    /** Input props passed to the field component */
+    inputProps?: FieldInputProps;
+    /** Display label */
+    label?: string;
+    /** Field type override - built-in type or custom component */
+    fieldType?: keyof typeof INPUT_COMPONENTS | React.FC<AutoFormInputComponentProps>;
+    /** Wrapper component for custom field layout */
+    renderParent?: (props: {
+        children: React.ReactNode;
+    }) => React.ReactElement | null;
+    /** Display order for field ordering */
+    order?: number;
+};
+/**
+ * A FormInput component can handle a specific Zod type (e.g. "ZodBoolean")
+ */
+type AutoFormInputComponentProps = {
+    zodInputProps: React.InputHTMLAttributes<HTMLInputElement>;
+    field: ControllerRenderProps<FieldValues, any>;
+    fieldConfigItem: FieldConfigItem;
+    label: string;
+    isRequired: boolean;
+    fieldProps: any;
+    zodItem: zod.ZodType;
+    className?: string;
+};
+
 /**
  * Context passed to lifecycle hooks
  */
@@ -405,5 +513,5 @@ interface CMSFileUploadProps extends AutoFormInputComponentProps {
  */
 declare function CMSFileUpload({ label, isRequired, fieldConfigItem, fieldProps, field, uploadImage, }: CMSFileUploadProps): react_jsx_runtime.JSX.Element;
 
-export { AutoFormInputComponentProps, CMSFileUpload, cmsClientPlugin };
-export type { CMSClientConfig, CMSClientHooks, CMSFileUploadProps, CMSLocalization, CMSPluginOverrides, LoaderContext, RouteContext };
+export { CMSFileUpload, cmsClientPlugin };
+export type { AutoFormInputComponentProps, CMSClientConfig, CMSClientHooks, CMSFileUploadProps, CMSLocalization, CMSPluginOverrides, LoaderContext, RouteContext };

package/dist/plugins/cms/query-keys.d.cts

@@ -1,11 +1,8 @@
 import * as _tanstack_react_query from '@tanstack/react-query';
 import { createApiClient } from '@btst/stack/plugins/client';
-import { S as SerializedContentType, P as PaginatedContentItems, a as SerializedContentItemWithType } from '../../shared/stack.BwkyFwF8.cjs';
+import { S as SerializedContentType, P as PaginatedContentItems, a as SerializedContentItemWithType } from '../../shared/stack.L-UFwz2G.cjs';
 import { CMSApiRouter } from './api/index.cjs';
 import 'zod';
-import '../../shared/stack.NZJogTUn.cjs';
-import 'react-hook-form';
-import 'react/jsx-runtime';
 import '@btst/stack/plugins/api';
 import 'better-call';
 

package/dist/plugins/cms/query-keys.d.mts

@@ -1,11 +1,8 @@
 import * as _tanstack_react_query from '@tanstack/react-query';
 import { createApiClient } from '@btst/stack/plugins/client';
-import { S as SerializedContentType, P as PaginatedContentItems, a as SerializedContentItemWithType } from '../../shared/stack.DBqxCs0V.mjs';
+import { S as SerializedContentType, P as PaginatedContentItems, a as SerializedContentItemWithType } from '../../shared/stack.L-UFwz2G.mjs';
 import { CMSApiRouter } from './api/index.mjs';
 import 'zod';
-import '../../shared/stack.NZJogTUn.mjs';
-import 'react-hook-form';
-import 'react/jsx-runtime';
 import '@btst/stack/plugins/api';
 import 'better-call';
 

package/dist/plugins/cms/query-keys.d.ts

@@ -1,11 +1,8 @@
 import * as _tanstack_react_query from '@tanstack/react-query';
 import { createApiClient } from '@btst/stack/plugins/client';
-import { S as SerializedContentType, P as PaginatedContentItems, a as SerializedContentItemWithType } from '../../shared/stack.DwnJA87a.js';
+import { S as SerializedContentType, P as PaginatedContentItems, a as SerializedContentItemWithType } from '../../shared/stack.L-UFwz2G.js';
 import { CMSApiRouter } from './api/index.js';
 import 'zod';
-import '../../shared/stack.NZJogTUn.js';
-import 'react-hook-form';
-import 'react/jsx-runtime';
 import '@btst/stack/plugins/api';
 import 'better-call';
 

package/dist/shared/{stack.DwnJA87a.d.ts → stack.L-UFwz2G.d.cts}

@@ -1,8 +1,16 @@
 import { z } from 'zod';
-import { A as AutoFormFieldType } from './stack.NZJogTUn.js';
 
 /**
- * Configuration for a content type defined by the developer
+ * Configuration for a content type defined by the developer.
+ *
+ * Field types are now specified directly in the Zod schema via .meta():
+ * @example
+ * ```typescript
+ * const ProductSchema = z.object({
+ *   description: z.string().meta({ fieldType: "textarea" }),
+ *   image: z.string().optional().meta({ fieldType: "file" }),
+ * });
+ * ```
  */
 interface ContentTypeConfig {
     /** Display name for the content type (e.g., "Product", "Testimonial") */
@@ -11,18 +19,8 @@ interface ContentTypeConfig {
     slug: string;
     /** Optional description shown in the admin UI */
     description?: string;
-    /** Zod schema defining the content type's fields */
+    /** Zod schema defining the content type's fields. Use .meta({ fieldType: "..." }) for field type overrides. */
     schema: z.ZodObject<z.ZodRawShape>;
-    /**
-     * Optional field configuration for AutoForm customization.
-     *
-     * fieldType can be:
-     * - A built-in AutoForm type: "checkbox", "date", "select", "radio", "switch", "textarea", "number", "file", "fallback"
-     * - A custom type name that maps to a component provided via `fieldComponents` in overrides
-     */
-    fieldConfig?: Record<string, {
-        fieldType?: AutoFormFieldType | (string & {});
-    }>;
 }
 /**
  * Content type stored in the database
@@ -37,8 +35,10 @@ type ContentType = {
     description?: string;
     /** JSON Schema representation of the Zod schema (stringified) */
     jsonSchema: string;
-    /** Optional field configuration JSON (stringified) */
+    /** @deprecated Legacy field config - now embedded in jsonSchema. Kept for backwards compat. */
     fieldConfig?: string;
+    /** AutoForm schema version. 1 = legacy (separate fieldConfig), 2 = unified (fieldType in jsonSchema) */
+    autoFormVersion?: number;
     createdAt: Date;
     updatedAt: Date;
 };

package/dist/shared/{stack.BwkyFwF8.d.cts → stack.L-UFwz2G.d.mts}

@@ -1,8 +1,16 @@
 import { z } from 'zod';
-import { A as AutoFormFieldType } from './stack.NZJogTUn.cjs';
 
 /**
- * Configuration for a content type defined by the developer
+ * Configuration for a content type defined by the developer.
+ *
+ * Field types are now specified directly in the Zod schema via .meta():
+ * @example
+ * ```typescript
+ * const ProductSchema = z.object({
+ *   description: z.string().meta({ fieldType: "textarea" }),
+ *   image: z.string().optional().meta({ fieldType: "file" }),
+ * });
+ * ```
  */
 interface ContentTypeConfig {
     /** Display name for the content type (e.g., "Product", "Testimonial") */
@@ -11,18 +19,8 @@ interface ContentTypeConfig {
     slug: string;
     /** Optional description shown in the admin UI */
     description?: string;
-    /** Zod schema defining the content type's fields */
+    /** Zod schema defining the content type's fields. Use .meta({ fieldType: "..." }) for field type overrides. */
     schema: z.ZodObject<z.ZodRawShape>;
-    /**
-     * Optional field configuration for AutoForm customization.
-     *
-     * fieldType can be:
-     * - A built-in AutoForm type: "checkbox", "date", "select", "radio", "switch", "textarea", "number", "file", "fallback"
-     * - A custom type name that maps to a component provided via `fieldComponents` in overrides
-     */
-    fieldConfig?: Record<string, {
-        fieldType?: AutoFormFieldType | (string & {});
-    }>;
 }
 /**
  * Content type stored in the database
@@ -37,8 +35,10 @@ type ContentType = {
     description?: string;
     /** JSON Schema representation of the Zod schema (stringified) */
     jsonSchema: string;
-    /** Optional field configuration JSON (stringified) */
+    /** @deprecated Legacy field config - now embedded in jsonSchema. Kept for backwards compat. */
     fieldConfig?: string;
+    /** AutoForm schema version. 1 = legacy (separate fieldConfig), 2 = unified (fieldType in jsonSchema) */
+    autoFormVersion?: number;
     createdAt: Date;
     updatedAt: Date;
 };

package/dist/shared/{stack.DBqxCs0V.d.mts → stack.L-UFwz2G.d.ts}

@@ -1,8 +1,16 @@
 import { z } from 'zod';
-import { A as AutoFormFieldType } from './stack.NZJogTUn.mjs';
 
 /**
- * Configuration for a content type defined by the developer
+ * Configuration for a content type defined by the developer.
+ *
+ * Field types are now specified directly in the Zod schema via .meta():
+ * @example
+ * ```typescript
+ * const ProductSchema = z.object({
+ *   description: z.string().meta({ fieldType: "textarea" }),
+ *   image: z.string().optional().meta({ fieldType: "file" }),
+ * });
+ * ```
  */
 interface ContentTypeConfig {
     /** Display name for the content type (e.g., "Product", "Testimonial") */
@@ -11,18 +19,8 @@ interface ContentTypeConfig {
     slug: string;
     /** Optional description shown in the admin UI */
     description?: string;
-    /** Zod schema defining the content type's fields */
+    /** Zod schema defining the content type's fields. Use .meta({ fieldType: "..." }) for field type overrides. */
     schema: z.ZodObject<z.ZodRawShape>;
-    /**
-     * Optional field configuration for AutoForm customization.
-     *
-     * fieldType can be:
-     * - A built-in AutoForm type: "checkbox", "date", "select", "radio", "switch", "textarea", "number", "file", "fallback"
-     * - A custom type name that maps to a component provided via `fieldComponents` in overrides
-     */
-    fieldConfig?: Record<string, {
-        fieldType?: AutoFormFieldType | (string & {});
-    }>;
 }
 /**
  * Content type stored in the database
@@ -37,8 +35,10 @@ type ContentType = {
     description?: string;
     /** JSON Schema representation of the Zod schema (stringified) */
     jsonSchema: string;
-    /** Optional field configuration JSON (stringified) */
+    /** @deprecated Legacy field config - now embedded in jsonSchema. Kept for backwards compat. */
     fieldConfig?: string;
+    /** AutoForm schema version. 1 = legacy (separate fieldConfig), 2 = unified (fieldType in jsonSchema) */
+    autoFormVersion?: number;
     createdAt: Date;
     updatedAt: Date;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@btst/stack",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "description": "A composable, plugin-based library for building full-stack applications.",
   "repository": {
     "type": "git",

package/src/plugins/cms/__tests__/schema-roundtrip.test.ts

@@ -338,6 +338,201 @@ describe("Zod to JSON Schema roundtrip", () => {
 		});
 	});
 
+	describe("Unified schema format with fieldType in .meta()", () => {
+		it("preserves fieldType in JSON Schema properties", () => {
+			const schema = z.object({
+				description: z.string().meta({
+					description: "Full description",
+					fieldType: "textarea",
+				}),
+				image: z.string().optional().meta({
+					description: "Image URL",
+					fieldType: "file",
+				}),
+			});
+
+			const jsonSchema = z.toJSONSchema(schema) as {
+				properties?: Record<
+					string,
+					{ description?: string; fieldType?: string }
+				>;
+			};
+
+			// fieldType should be preserved in JSON Schema properties
+			expect(jsonSchema.properties?.description?.fieldType).toBe("textarea");
+			expect(jsonSchema.properties?.image?.fieldType).toBe("file");
+		});
+
+		it("preserves placeholder in JSON Schema properties", () => {
+			const schema = z.object({
+				name: z.string().meta({
+					placeholder: "Enter product name...",
+				}),
+			});
+
+			const jsonSchema = z.toJSONSchema(schema) as {
+				properties?: Record<string, { placeholder?: string }>;
+			};
+
+			expect(jsonSchema.properties?.name?.placeholder).toBe(
+				"Enter product name...",
+			);
+		});
+
+		it("simulates unified schema storage and retrieval", () => {
+			// This test simulates the new CMS flow with unified schema:
+			// 1. Developer defines schema with fieldType in .meta()
+			// 2. Backend converts to JSON Schema and stores (fieldType embedded)
+			// 3. Client reads JSON Schema and extracts fieldType for AutoForm
+
+			// Step 1: Developer defines schema with fieldType in .meta()
+			const ProductSchema = z.object({
+				name: z.string().min(1).meta({
+					description: "Product name",
+					placeholder: "Enter name...",
+				}),
+				description: z.string().meta({
+					description: "Full description",
+					fieldType: "textarea",
+				}),
+				image: z.string().optional().meta({
+					description: "Product image",
+					fieldType: "file",
+				}),
+				price: z.number().min(0).meta({
+					placeholder: "0.00",
+				}),
+			});
+
+			// Step 2: Convert to JSON Schema (stored in DB as version 2)
+			const jsonSchema = z.toJSONSchema(ProductSchema);
+			const dbStoredString = JSON.stringify(jsonSchema);
+
+			// Step 3: Client fetches and extracts fieldTypes
+			const fetchedSchema = JSON.parse(dbStoredString) as {
+				properties?: Record<
+					string,
+					{ description?: string; placeholder?: string; fieldType?: string }
+				>;
+			};
+
+			// Verify fieldTypes are preserved
+			expect(fetchedSchema.properties?.description?.fieldType).toBe("textarea");
+			expect(fetchedSchema.properties?.image?.fieldType).toBe("file");
+
+			// Verify other meta properties are preserved
+			expect(fetchedSchema.properties?.name?.description).toBe("Product name");
+			expect(fetchedSchema.properties?.name?.placeholder).toBe("Enter name...");
+			expect(fetchedSchema.properties?.price?.placeholder).toBe("0.00");
+		});
+	});
+
+	describe("Legacy schema migration", () => {
+		/**
+		 * Simulates the migrateToUnifiedSchema function from api/plugin.ts
+		 */
+		function migrateToUnifiedSchema(
+			jsonSchemaStr: string,
+			fieldConfigStr: string | null | undefined,
+		): string {
+			if (!fieldConfigStr) {
+				return jsonSchemaStr;
+			}
+
+			try {
+				const jsonSchema = JSON.parse(jsonSchemaStr);
+				const fieldConfig = JSON.parse(fieldConfigStr);
+
+				if (!jsonSchema.properties || typeof fieldConfig !== "object") {
+					return jsonSchemaStr;
+				}
+
+				// Merge fieldType from fieldConfig into each property
+				for (const [key, config] of Object.entries(fieldConfig)) {
+					if (
+						jsonSchema.properties[key] &&
+						typeof config === "object" &&
+						config !== null &&
+						"fieldType" in config
+					) {
+						jsonSchema.properties[key].fieldType = (
+							config as { fieldType: string }
+						).fieldType;
+					}
+				}
+
+				return JSON.stringify(jsonSchema);
+			} catch {
+				return jsonSchemaStr;
+			}
+		}
+
+		it("merges legacy fieldConfig into JSON Schema", () => {
+			// Legacy format: separate jsonSchema and fieldConfig
+			const legacyJsonSchema = JSON.stringify({
+				type: "object",
+				properties: {
+					name: { type: "string", description: "Product name" },
+					description: { type: "string" },
+					image: { type: "string" },
+				},
+				required: ["name", "description"],
+			});
+
+			const legacyFieldConfig = JSON.stringify({
+				description: { fieldType: "textarea" },
+				image: { fieldType: "file" },
+			});
+
+			// Migrate
+			const migratedStr = migrateToUnifiedSchema(
+				legacyJsonSchema,
+				legacyFieldConfig,
+			);
+			const migrated = JSON.parse(migratedStr);
+
+			// Verify fieldTypes are now embedded
+			expect(migrated.properties.description.fieldType).toBe("textarea");
+			expect(migrated.properties.image.fieldType).toBe("file");
+
+			// Verify other properties are preserved
+			expect(migrated.properties.name.description).toBe("Product name");
+			expect(migrated.required).toEqual(["name", "description"]);
+		});
+
+		it("handles null fieldConfig", () => {
+			const jsonSchema = JSON.stringify({
+				type: "object",
+				properties: {
+					name: { type: "string" },
+				},
+			});
+
+			const result = migrateToUnifiedSchema(jsonSchema, null);
+			expect(result).toBe(jsonSchema);
+		});
+
+		it("handles undefined fieldConfig", () => {
+			const jsonSchema = JSON.stringify({
+				type: "object",
+				properties: {
+					name: { type: "string" },
+				},
+			});
+
+			const result = migrateToUnifiedSchema(jsonSchema, undefined);
+			expect(result).toBe(jsonSchema);
+		});
+
+		it("handles invalid JSON gracefully", () => {
+			const jsonSchema = "invalid json";
+			const fieldConfig = "also invalid";
+
+			const result = migrateToUnifiedSchema(jsonSchema, fieldConfig);
+			expect(result).toBe(jsonSchema); // Returns original on error
+		});
+	});
+
 	describe("AutoForm schema generation and data shape", () => {
 		/**
 		 * Helper function to convert JSON Schema to Zod with coercion for AutoForm