@btst/stack 3.1.1 → 4.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@btst/stack",
-  "version": "3.1.1",
+  "version": "4.0.0",
   "description": "A composable, plugin-based library for building full-stack applications.",
   "repository": {
     "type": "git",
@@ -1067,7 +1067,7 @@
     }
   },
   "dependencies": {
-    "@btst/db": "2.2.3",
+    "@btst/db": "3.0.0",
     "@milkdown/crepe": "^7.17.1",
     "@milkdown/kit": "^7.17.1",
     "remend": "^1.0.1",
@@ -1088,7 +1088,7 @@
     "@tanstack/react-router": ">=1.0.0",
     "@vercel/blob": ">=0.14.0",
     "ai": ">=5.0.0",
-    "better-call": "1.3.6",
+    "better-call": "1.4.0",
     "class-variance-authority": ">=0.7.0",
     "clsx": ">=2.1.0",
     "cmdk": ">=1.1.0",
@@ -1097,8 +1097,8 @@
     "katex": ">=0.16.0",
     "lucide-react": ">=0.469.0",
     "next": ">=15.0.0",
-    "react": "^18.0.0 || ^19.0.0",
-    "react-dom": "^18.0.0 || ^19.0.0",
+    "react": ">=19.2.6",
+    "react-dom": ">=19.2.6",
     "react-error-boundary": ">=4.0.0",
     "react-hook-form": ">=7.55.0",
     "react-markdown": ">=9.1.0",
@@ -1110,7 +1110,7 @@
     "remark-math": ">=6.0.0",
     "sonner": ">=2.0.0",
     "tailwind-merge": ">=2.6.0",
-    "tailwindcss": ">=3.0.0",
+    "tailwindcss": ">=4.3.2",
     "zod": ">=4.2.0"
   },
   "peerDependenciesMeta": {
@@ -1137,7 +1137,10 @@
     "@ai-sdk/react": "^2.0.94",
     "@aws-sdk/client-s3": "^3.1011.0",
     "@aws-sdk/s3-request-presigner": "^3.1011.0",
-    "@btst/adapter-memory": "2.2.3",
+    "@better-auth/core": "1.7.6",
+    "@better-auth/utils": "0.4.2",
+    "@better-fetch/fetch": "1.3.2",
+    "@btst/adapter-memory": "3.0.0",
     "@btst/yar": "1.3.2",
     "@tanstack/react-router": "1.168.10",
     "@types/react": "^19.0.0",
@@ -1146,6 +1149,7 @@
     "@vercel/blob": "^0.27.3",
     "@workspace/ui": "workspace:*",
     "ai": "^5.0.94",
+    "better-auth": "1.7.6",
     "better-call": "catalog:",
     "jsdom": "^28.1.0",
     "knip": "^5.61.2",

package/src/__tests__/package-metadata.test.ts

@@ -11,7 +11,7 @@ import { z } from "zod";
 const execFileAsync = promisify(execFile);
 
 describe("published dependency alignment", () => {
-	it("uses the Better DB release that shares the Better Auth 1.6.16 cohort", async () => {
+	it("uses the Better DB release that shares the Better Auth 1.7.6 cohort", async () => {
 		const manifest = JSON.parse(
 			await readFile(resolve("package.json"), "utf8"),
 		) as {
@@ -20,11 +20,11 @@ describe("published dependency alignment", () => {
 			peerDependencies?: Record<string, string>;
 		};
 
-		expect(manifest.dependencies?.["@btst/db"]).toBe("2.2.3");
-		expect(manifest.devDependencies?.["@btst/adapter-memory"]).toBe("2.2.3");
+		expect(manifest.dependencies?.["@btst/db"]).toBe("3.0.0");
+		expect(manifest.devDependencies?.["@btst/adapter-memory"]).toBe("3.0.0");
 		expect(manifest.devDependencies?.["@btst/yar"]).toBe("1.3.2");
 		expect(manifest.peerDependencies?.["@btst/yar"]).toBe(">=1.3.2");
-		expect(manifest.peerDependencies?.["better-call"]).toBe("1.3.6");
+		expect(manifest.peerDependencies?.["better-call"]).toBe("1.4.0");
 	});
 });
 

package/src/plugins/ai-chat/__tests__/hooks.test.tsx

@@ -177,58 +177,74 @@ describe("useRenameConversationForm", () => {
 });
 
 describe("useDeleteConversation", () => {
-	it("refreshes the list and evicts only the deleted detail in the starting identity partition", async () => {
-		const identityPartition = "anonymous" as const;
-		const otherConversation = { ...conversation, id: "conv-2", title: "Other" };
-		const otherIdentity = { id: "other-user", role: "user" } as const;
-		const listKey = buildQueryKey(
-			"conversations",
-			"list",
-			aiChatResources.conversations.queries.list,
-			[identityPartition],
-		);
-		const deletedDetailKey = buildQueryKey(
-			"conversations",
-			"detail",
-			aiChatResources.conversations.queries.detail,
-			[conversation.id, identityPartition],
-		);
-		const otherDetailKey = buildQueryKey(
-			"conversations",
-			"detail",
-			aiChatResources.conversations.queries.detail,
-			[otherConversation.id, identityPartition],
-		);
-		const otherIdentityDetailKey = buildQueryKey(
-			"conversations",
-			"detail",
-			aiChatResources.conversations.queries.detail,
-			[conversation.id, otherIdentity],
-		);
-		let listFetches = 0;
-		await queryClient.fetchQuery({
-			queryKey: listKey,
-			queryFn: async () => {
-				listFetches += 1;
-				return [conversation, otherConversation];
-			},
-		});
-		listFetches = 0;
-		queryClient.setQueryData(deletedDetailKey, conversation);
-		queryClient.setQueryData(otherDetailKey, otherConversation);
-		queryClient.setQueryData(otherIdentityDetailKey, conversation);
-		fetchMock.mockResolvedValue(jsonResponse({ success: true }));
-		const getMutation = await renderDeleteProbe();
-
-		await act(async () => {
-			await getMutation().mutateAsync({ id: conversation.id });
-		});
-
-		expect(listFetches).toBe(1);
-		expect(queryClient.getQueryData(deletedDetailKey)).toBeUndefined();
-		expect(queryClient.getQueryData(otherDetailKey)).toEqual(otherConversation);
-		expect(queryClient.getQueryData(otherIdentityDetailKey)).toEqual(
-			conversation,
-		);
-	});
+	it.each(["mutate", "mutateAsync"] as const)(
+		"%s forwards callbacks and evicts only the deleted detail in the starting identity partition",
+		async (method) => {
+			const identityPartition = "anonymous" as const;
+			const otherConversation = {
+				...conversation,
+				id: "conv-2",
+				title: "Other",
+			};
+			const otherIdentity = { id: "other-user", role: "user" } as const;
+			const listKey = buildQueryKey(
+				"conversations",
+				"list",
+				aiChatResources.conversations.queries.list,
+				[identityPartition],
+			);
+			const deletedDetailKey = buildQueryKey(
+				"conversations",
+				"detail",
+				aiChatResources.conversations.queries.detail,
+				[conversation.id, identityPartition],
+			);
+			const otherDetailKey = buildQueryKey(
+				"conversations",
+				"detail",
+				aiChatResources.conversations.queries.detail,
+				[otherConversation.id, identityPartition],
+			);
+			const otherIdentityDetailKey = buildQueryKey(
+				"conversations",
+				"detail",
+				aiChatResources.conversations.queries.detail,
+				[conversation.id, otherIdentity],
+			);
+			let listFetches = 0;
+			await queryClient.fetchQuery({
+				queryKey: listKey,
+				queryFn: async () => {
+					listFetches += 1;
+					return [conversation, otherConversation];
+				},
+			});
+			listFetches = 0;
+			queryClient.setQueryData(deletedDetailKey, conversation);
+			queryClient.setQueryData(otherDetailKey, otherConversation);
+			queryClient.setQueryData(otherIdentityDetailKey, conversation);
+			fetchMock.mockResolvedValue(jsonResponse({ success: true }));
+			const getMutation = await renderDeleteProbe();
+			const onSuccess = vi.fn();
+
+			await act(async () => {
+				await getMutation()[method]({ id: conversation.id }, { onSuccess });
+				await vi.waitFor(() =>
+					expect(queryClient.getQueryData(deletedDetailKey)).toBeUndefined(),
+				);
+			});
+
+			expect(onSuccess).toHaveBeenCalledTimes(1);
+			expect(onSuccess.mock.calls[0]?.[1]).toEqual({ id: conversation.id });
+
+			expect(listFetches).toBe(1);
+			expect(queryClient.getQueryData(deletedDetailKey)).toBeUndefined();
+			expect(queryClient.getQueryData(otherDetailKey)).toEqual(
+				otherConversation,
+			);
+			expect(queryClient.getQueryData(otherIdentityDetailKey)).toEqual(
+				conversation,
+			);
+		},
+	);
 });

package/src/plugins/ai-chat/client/hooks/chat-hooks.tsx

@@ -146,25 +146,22 @@ function withCurrentHistoryRefresh<TData, TVariables>(
 	refresh: ReturnType<typeof useCurrentHistoryRefresh>,
 	queryKey?: readonly unknown[],
 	afterSuccess?: (
-		variables: TVariables,
+		variables: Parameters<typeof mutation.mutateAsync>[0],
 		startedAs: ReturnType<typeof useAiChatIdentityPartition>,
 	) => void,
 ): UseMutationResult<TData, Error, TVariables> {
-	const mutateAsync: typeof mutation.mutateAsync = async (
-		variables,
-		options,
-	) => {
+	const mutateAsync: typeof mutation.mutateAsync = async (...args) => {
 		const startedAs = refresh.currentPartition();
-		const result = await mutation.mutateAsync(variables, options);
+		const result = await mutation.mutateAsync(...args);
 		try {
 			await refresh.refreshAfterSuccess(startedAs, queryKey);
 		} finally {
-			afterSuccess?.(variables, startedAs);
+			afterSuccess?.(args[0], startedAs);
 		}
 		return result;
 	};
-	const mutate: typeof mutation.mutate = (variables, options) => {
-		void mutateAsync(variables, options).catch(() => {});
+	const mutate: typeof mutation.mutate = (...args) => {
+		void mutateAsync(...args).catch(() => {});
 	};
 	return { ...mutation, mutate, mutateAsync };
 }

package/src/plugins/cms/__tests__/sync-content-types.test.ts

@@ -0,0 +1,131 @@
+import { createMemoryAdapter } from "@btst/adapter-memory";
+import type { DBAdapter } from "@btst/db";
+import { describe, expect, it, vi } from "vitest";
+import { z } from "zod";
+import { createBackendStack } from "../../../api";
+import { cmsBackendPlugin } from "../api";
+import type { ContentType } from "../types";
+
+const contentTypes = [
+	{
+		name: "Article",
+		slug: "article",
+		schema: z.object({
+			title: z.string(),
+			status: z.enum(["draft", "published"]),
+		}),
+	},
+];
+function coldStart(adapter?: DBAdapter) {
+	return createBackendStack({
+		basePath: "/api",
+		plugins: { cms: cmsBackendPlugin({ contentTypes }) },
+		adapter: (schema) => adapter ?? createMemoryAdapter(schema)({}),
+	});
+}
+async function fixture() {
+	const stack = coldStart();
+	await stack.trusted.cms.listContentTypes({});
+	const stored = await stack.adapter.findOne<ContentType>({
+		model: "contentType",
+		where: [{ field: "slug", value: "article" }],
+	});
+	if (!stored) throw new Error("Missing seeded content type");
+	return { adapter: stack.adapter, stored };
+}
+
+describe("CMS content-type synchronization", () => {
+	it("performs no updates on repeated cold starts and preserves serialized data", async () => {
+		const { adapter } = await fixture();
+		const update = vi.spyOn(adapter, "update");
+		const first = await coldStart(adapter).trusted.cms.listContentTypes({});
+		const second = await coldStart(adapter).trusted.cms.listContentTypes({});
+		expect(update).not.toHaveBeenCalled();
+		expect(JSON.stringify(second)).toBe(JSON.stringify(first));
+	});
+
+	it("ignores JSON whitespace and nested object key order", async () => {
+		const { adapter, stored } = await fixture();
+		const reordered = JSON.stringify(
+			JSON.parse(stored.jsonSchema),
+			(key, value) =>
+				key !== "properties" &&
+				value &&
+				typeof value === "object" &&
+				!Array.isArray(value)
+					? Object.fromEntries(Object.entries(value).reverse())
+					: value,
+			2,
+		);
+		await adapter.update({
+			model: "contentType",
+			where: [{ field: "id", value: stored.id }],
+			update: { jsonSchema: reordered },
+		});
+		const update = vi.spyOn(adapter, "update");
+		await coldStart(adapter).trusted.cms.listContentTypes({});
+		expect(update).not.toHaveBeenCalled();
+	});
+
+	it.each([
+		["name", "Old article"],
+		["description", "Old description"],
+		["jsonSchema", '{"type":"object","properties":{}}'],
+		["jsonSchema", "invalid legacy JSON"],
+		["fieldConfig", '{"title":{"fieldType":"textarea"}}'],
+		["autoFormVersion", 1],
+	] as const)("updates changed %s exactly once", async (field, value) => {
+		const { adapter, stored } = await fixture();
+		await adapter.update({
+			model: "contentType",
+			where: [{ field: "id", value: stored.id }],
+			update: { [field]: value, updatedAt: new Date("2000-01-01") },
+		});
+		const update = vi.spyOn(adapter, "update");
+		await coldStart(adapter).trusted.cms.listContentTypes({});
+		expect(update).toHaveBeenCalledTimes(1);
+		expect(update.mock.calls[0]?.[0].update).toMatchObject({
+			name: "Article",
+			description: null,
+			jsonSchema: stored.jsonSchema,
+			fieldConfig: null,
+			autoFormVersion: 2,
+		});
+		expect(update.mock.calls[0]?.[0].update.updatedAt).not.toEqual(
+			new Date("2000-01-01"),
+		);
+		await coldStart(adapter).trusted.cms.listContentTypes({});
+		expect(update).toHaveBeenCalledTimes(1);
+	});
+
+	it("updates reordered schema properties because they control form field order", async () => {
+		const { adapter, stored } = await fixture();
+		const schema = JSON.parse(stored.jsonSchema);
+		schema.properties = Object.fromEntries(
+			Object.entries(schema.properties).reverse(),
+		);
+		await adapter.update({
+			model: "contentType",
+			where: [{ field: "id", value: stored.id }],
+			update: { jsonSchema: JSON.stringify(schema) },
+		});
+		const update = vi.spyOn(adapter, "update");
+		await coldStart(adapter).trusted.cms.listContentTypes({});
+		expect(update).toHaveBeenCalledTimes(1);
+		expect(update.mock.calls[0]?.[0].update.jsonSchema).toBe(stored.jsonSchema);
+	});
+
+	it("preserves meaningful array ordering in schema comparisons", async () => {
+		const { adapter, stored } = await fixture();
+		const schema = JSON.parse(stored.jsonSchema);
+		schema.properties.status.enum.reverse();
+		await adapter.update({
+			model: "contentType",
+			where: [{ field: "id", value: stored.id }],
+			update: { jsonSchema: JSON.stringify(schema) },
+		});
+		const update = vi.spyOn(adapter, "update");
+		await coldStart(adapter).trusted.cms.listContentTypes({});
+		expect(update).toHaveBeenCalledTimes(1);
+	});
+});

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

@@ -63,6 +63,28 @@ interface CMSPrefetchForRoute {
 	): Promise<void>;
 }
 
+/** Preserve form field order while normalizing JSON metadata key order. */
+function schemasEqual(stored: string, configured: string): boolean {
+	const normalize = (key: string, value: unknown): unknown =>
+		key !== "properties" &&
+		value &&
+		typeof value === "object" &&
+		!Array.isArray(value)
+			? Object.fromEntries(
+					Object.entries(value).sort(([a], [b]) => a.localeCompare(b)),
+				)
+			: value;
+	try {
+		return (
+			JSON.stringify(JSON.parse(stored), normalize) ===
+			JSON.stringify(JSON.parse(configured), normalize)
+		);
+	} catch {
+		// A malformed stored schema still needs repair from the code definition.
+		return false;
+	}
+}
+
 async function syncContentTypes(
 	adapter: Adapter,
 	config: CMSBackendConfig,
@@ -76,6 +98,14 @@ async function syncContentTypes(
 			],
 		});
 		if (existing) {
+			if (
+				existing.name === definition.name &&
+				(existing.description ?? null) === (definition.description ?? null) &&
+				schemasEqual(existing.jsonSchema, jsonSchema) &&
+				existing.fieldConfig == null &&
+				existing.autoFormVersion === 2
+			)
+				continue;
 			await adapter.update({
 				model: "contentType",
 				where: [{ field: "id", value: existing.id, operator: "eq" as const }],

package/src/plugins/kanban/__tests__/getters.test.ts

@@ -3,7 +3,7 @@ import { createMemoryAdapter } from "@btst/adapter-memory";
 import { defineDb } from "@btst/db";
 import type { DBAdapter as Adapter } from "@btst/db";
 import { kanbanSchema } from "../db";
-import { getAllBoards, getBoardById } from "../api/getters";
+import { getAllBoards, getBoardById, getBoardSummaries } from "../api/getters";
 
 const createTestAdapter = (): Adapter => {
 	const db = defineDb({}).use(kanbanSchema);
@@ -90,6 +90,7 @@ describe("kanban getters", () => {
 			expect(total).toBe(1);
 			expect(boards[0]!.slug).toBe("my-board");
 			expect(boards[0]!.columns).toHaveLength(1);
+			expect(boards[0]).not.toHaveProperty("kanbanColumn");
 			expect(boards[0]!.columns[0]!.title).toBe("To Do");
 			expect(boards[0]!.columns[0]!.tasks).toHaveLength(1);
 			expect(boards[0]!.columns[0]!.tasks[0]!.title).toBe("Task 1");
@@ -139,6 +140,18 @@ describe("kanban getters", () => {
 		});
 	});
 
+	it("returns joined column summaries without leaking raw relations or tasks", async () => {
+		const board = await createBoard(adapter, "Board", "board");
+		const column = await createColumn(adapter, board.id, "To Do", 0);
+		await createTask(adapter, column.id, "Private task", 0);
+
+		const { items } = await getBoardSummaries(adapter);
+		expect(items[0]?.columns).toHaveLength(1);
+		expect(items[0]?.columns[0]?.title).toBe("To Do");
+		expect(items[0]).not.toHaveProperty("kanbanColumn");
+		expect(items[0]?.columns[0]).not.toHaveProperty("tasks");
+	});
+
 	describe("getBoardById", () => {
 		it("returns null when board does not exist", async () => {
 			const board = await getBoardById(adapter, "nonexistent");

package/src/plugins/kanban/api/getters.ts

@@ -65,15 +65,15 @@ async function getBoardRows(
 }
 
 /**
- * Given a raw board record (with a `column` join), fetches tasks for every
+ * Given a raw board record (with a `kanbanColumn` join), fetches tasks for every
  * column in parallel and returns the sorted columns with their tasks attached.
- * Strips the raw `column` join field from the returned board object.
+ * Strips the raw `kanbanColumn` join field from the returned board object.
  */
 async function hydrateColumnsWithTasks(
 	adapter: Adapter,
 	board: BoardWithKanbanColumn,
 ): Promise<BoardWithColumns> {
-	const columnIds = (board.column || []).map((c) => c.id);
+	const columnIds = (board.kanbanColumn || []).map((c) => c.id);
 	const tasksByColumn = new Map<string, Task[]>();
 
 	if (columnIds.length > 0) {
@@ -97,11 +97,11 @@ async function hydrateColumnsWithTasks(
 		}
 	}
 
-	const columns: ColumnWithTasks[] = (board.column || [])
+	const columns: ColumnWithTasks[] = (board.kanbanColumn || [])
 		.sort((a, b) => a.order - b.order)
 		.map((col) => ({ ...col, tasks: tasksByColumn.get(col.id) || [] }));
 
-	const { column: _, ...boardWithoutJoin } = board;
+	const { kanbanColumn: _, ...boardWithoutJoin } = board;
 	return { ...boardWithoutJoin, columns };
 }
 
@@ -131,9 +131,11 @@ export async function getBoardSummaries(
 	const result = await getBoardRows(adapter, params);
 	return {
 		...result,
-		items: result.items.map(({ column = [], ...board }) => ({
+		items: result.items.map(({ kanbanColumn = [], ...board }) => ({
 			...board,
-			columns: [...column].sort((left, right) => left.order - right.order),
+			columns: [...kanbanColumn].sort(
+				(left, right) => left.order - right.order,
+			),
 		})),
 	};
 }

package/src/plugins/kanban/types.ts

@@ -85,20 +85,18 @@ export type BoardWithColumnsOnly = Board & {
 
 /**
  * Board with joined column relationships from the database
- * Note: The adapter returns joined data under the schema key name ("column"),
- * not the model name ("kanbanColumn")
+ * Better DB 3 returns joined data under the canonical model name.
  */
 export type BoardWithKanbanColumn = Board & {
-	column?: Column[];
+	kanbanColumn?: Column[];
 };
 
 /**
  * Column with joined task relationships from the database
- * Note: The adapter returns joined data under the schema key name ("task"),
- * not the model name ("kanbanTask")
+ * Better DB 3 returns joined data under the canonical model name.
  */
 export type ColumnWithKanbanTask = Column & {
-	task?: Task[];
+	kanbanTask?: Task[];
 };
 
 // Serialized types for API responses (dates as strings)

package/src/plugins/media/client/hooks/use-media.tsx

@@ -157,12 +157,10 @@ function withCurrentListRefresh<TData, TVariables>(
 	mapResult: (data: TData) => TData = (data) => data,
 	data: TData | undefined = mutation.data,
 ): UseMutationResult<TData, Error, TVariables> {
-	const mutateAsync: typeof mutation.mutateAsync = async (
-		variables,
-		options,
-	) => {
+	const mutateAsync: typeof mutation.mutateAsync = async (...args) => {
+		const options = args[1];
 		const startedAs = listRefresh.currentScope();
-		const result = await mutation.mutateAsync(variables, {
+		args[1] = {
 			...options,
 			onSuccess: options?.onSuccess
 				? (data, ...args) => options.onSuccess?.(mapResult(data), ...args)
@@ -174,14 +172,15 @@ function withCurrentListRefresh<TData, TVariables>(
 							...args,
 						)
 				: undefined,
-		});
+		};
+		const result = await mutation.mutateAsync(...args);
 		await listRefresh.refreshAfterSuccess(startedAs);
 		return mapResult(result);
 	};
-	const mutate: typeof mutation.mutate = (variables, options) => {
+	const mutate: typeof mutation.mutate = (...args) => {
 		// Each invocation owns an awaited promise, so a later mutation cannot
 		// detach the successful call's required cache refresh.
-		void mutateAsync(variables, options).catch(() => {});
+		void mutateAsync(...args).catch(() => {});
 	};
 	return {
 		...mutation,