@firtoz/drizzle-utils 1.0.0 → 1.0.2

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @firtoz/drizzle-utils
 
+## 1.0.2
+
+### Patch Changes
+
+- [`bca3758`](https://github.com/firtoz/fullstack-toolkit/commit/bca3758ab5ad2661b950360dc35edda2680c3b4e) Thanks [@firtoz](https://github.com/firtoz)! - Bump minimum `valibot` peer dependency from `>=1.0.0` to `>=1.3.1`.
+
+## 1.0.1
+
+### Patch Changes
+
+- [`5c667ec`](https://github.com/firtoz/fullstack-toolkit/commit/5c667ecfce1ed4f22ccf9686ad37f00e7a4ecee3) Thanks [@firtoz](https://github.com/firtoz)! - Refactor `SyncBackend`, `createSyncFunction`, and `createCollectionConfig` to delegate to generic (Drizzle-free) implementations from `@firtoz/db-helpers`. No public API changes.
+
+- Updated dependencies [[`5c667ec`](https://github.com/firtoz/fullstack-toolkit/commit/5c667ecfce1ed4f22ccf9686ad37f00e7a4ecee3), [`5c667ec`](https://github.com/firtoz/fullstack-toolkit/commit/5c667ecfce1ed4f22ccf9686ad37f00e7a4ecee3)]:
+  - @firtoz/db-helpers@2.0.0
+
 ## 1.0.0
 
 ### Major Changes

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@firtoz/drizzle-utils",
-	"version": "1.0.0",
+	"version": "1.0.2",
 	"description": "Shared utilities and types for Drizzle-based packages",
 	"main": "./src/index.ts",
 	"module": "./src/index.ts",
@@ -53,19 +53,19 @@
 		"access": "public"
 	},
 	"peerDependencies": {
-		"@tanstack/db": ">=0.5.26",
+		"@tanstack/db": ">=0.5.33",
 		"drizzle-orm": ">=0.45.1",
 		"drizzle-valibot": ">=0.4.0",
-		"valibot": ">=1.0.0"
+		"valibot": ">=1.3.1"
 	},
 	"devDependencies": {
-		"@tanstack/db": "^0.5.26",
+		"@tanstack/db": "^0.5.33",
 		"drizzle-orm": "^0.45.1",
 		"drizzle-valibot": "^0.4.2",
-		"valibot": "^1.2.0"
+		"valibot": "^1.3.1"
 	},
 	"dependencies": {
-		"@firtoz/db-helpers": "^1.0.0",
+		"@firtoz/db-helpers": "^2.0.0",
 		"@firtoz/maybe-error": "^1.5.2"
 	}
 }

package/src/collection-utils.ts

@@ -1,5 +1,12 @@
-import type { CollectionUtils, SyncMessage } from "@firtoz/db-helpers";
-import { exhaustiveGuard } from "@firtoz/maybe-error";
+import type { CollectionUtils } from "@firtoz/db-helpers";
+import {
+	type GenericBaseSyncConfig,
+	type GenericSyncBackend,
+	type GenericSyncFunctionResult,
+	createGenericSyncFunction,
+	createGenericCollectionConfig,
+	USE_DEDUPE as _USE_DEDUPE,
+} from "@firtoz/db-helpers";
 import { type Table, SQL, getTableColumns } from "drizzle-orm";
 import type { BuildSchema } from "drizzle-valibot";
 import { createInsertSchema } from "drizzle-valibot";
@@ -9,12 +16,8 @@ import type {
 	UtilsRecord,
 	CollectionConfig,
 	InferSchemaOutput,
-	SyncConfig,
-	SyncConfigRes,
 	SyncMode,
-	LoadSubsetOptions,
 } from "@tanstack/db";
-import { DeduplicatedLoadSubset } from "@tanstack/db";
 
 /**
  * Utility type for branded IDs
@@ -89,339 +92,41 @@ export type InferCollectionFromTable<TTable extends Table> = Collection<
 	}
 >;
 
-// WORKAROUND: DeduplicatedLoadSubset has a bug where toggling queries (e.g., isNull/isNotNull)
-// creates invalid expressions like not(or(isNull(...), not(isNull(...))))
-// See: https://github.com/TanStack/db/issues/828
-// TODO: Re-enable once the bug is fixed
-export const USE_DEDUPE = false as boolean;
+export const USE_DEDUPE = _USE_DEDUPE;
 
 /**
- * Base configuration for sync lifecycle management
+ * Base configuration for sync lifecycle management.
+ * Extends the generic (Drizzle-free) config with a Drizzle table reference.
  */
-export interface BaseSyncConfig<TTable extends Table> {
-	/**
-	 * The Drizzle table definition
-	 */
+export interface BaseSyncConfig<TTable extends Table>
+	extends GenericBaseSyncConfig {
 	table: TTable;
-	/**
-	 * Promise that resolves when the database is ready
-	 */
-	readyPromise: Promise<void>;
-	/**
-	 * Sync mode: 'eager' (immediate) or 'lazy' (on-demand)
-	 */
-	syncMode?: SyncMode;
-	/**
-	 * Enable debug logging
-	 */
-	debug?: boolean;
 }
 
 /**
- * Backend-specific implementations required for sync
+ * Backend-specific implementations required for sync.
+ * Drizzle-typed alias for GenericSyncBackend.
  */
-export interface SyncBackend<TTable extends Table> {
-	/**
-	 * Initial data load - should call write() for each item
-	 */
-	initialLoad: () => Promise<Array<InferSchemaOutput<SelectSchema<TTable>>>>;
-	/**
-	 * Load a subset of data based on query options
-	 */
-	loadSubset: (
-		options: LoadSubsetOptions,
-	) => Promise<Array<InferSchemaOutput<SelectSchema<TTable>>>>;
-	/**
-	 * Handle insert mutations
-	 */
-	handleInsert: (
-		items: Array<InferSchemaOutput<SelectSchema<TTable>>>,
-	) => Promise<Array<InferSchemaOutput<SelectSchema<TTable>>>>;
-	/**
-	 * Handle update mutations
-	 */
-	handleUpdate: (
-		mutations: Array<{
-			key: string;
-			changes: Partial<InferSchemaOutput<SelectSchema<TTable>>>;
-			original: InferSchemaOutput<SelectSchema<TTable>>;
-		}>,
-	) => Promise<Array<InferSchemaOutput<SelectSchema<TTable>>>>;
-	/**
-	 * Handle delete mutations
-	 */
-	handleDelete: (
-		mutations: Array<{
-			key: string;
-			modified: InferSchemaOutput<SelectSchema<TTable>>;
-			original: InferSchemaOutput<SelectSchema<TTable>>;
-		}>,
-	) => Promise<void>;
-	/**
-	 * Handle truncate (clear all data from store)
-	 * Optional - if not provided, truncate util won't be available
-	 */
-	handleTruncate?: () => Promise<void>;
-}
+export type SyncBackend<TTable extends Table> = GenericSyncBackend<
+	InferSchemaOutput<SelectSchema<TTable>>
+>;
 
 /**
- * Return type for createSyncFunction that includes both sync config and listeners
+ * Return type for createSyncFunction.
+ * Drizzle-typed alias for GenericSyncFunctionResult.
  */
-export type SyncFunctionResult<TTable extends Table> = {
-	sync: SyncConfig<InferSchemaOutput<SelectSchema<TTable>>, string>["sync"];
-	onInsert: CollectionConfig<
-		InferSchemaOutput<SelectSchema<TTable>>,
-		string,
-		// biome-ignore lint/suspicious/noExplicitAny: Schema type parameter needs to be flexible
-		any
-	>["onInsert"];
-	onUpdate: CollectionConfig<
-		InferSchemaOutput<SelectSchema<TTable>>,
-		string,
-		// biome-ignore lint/suspicious/noExplicitAny: Schema type parameter needs to be flexible
-		any
-	>["onUpdate"];
-	onDelete: CollectionConfig<
-		InferSchemaOutput<SelectSchema<TTable>>,
-		string,
-		// biome-ignore lint/suspicious/noExplicitAny: Schema type parameter needs to be flexible
-		any
-	>["onDelete"];
-	/**
-	 * Collection utilities including truncate and external sync
-	 */
-	utils: CollectionUtils<InferSchemaOutput<SelectSchema<TTable>>>;
-};
+export type SyncFunctionResult<TTable extends Table> =
+	GenericSyncFunctionResult<InferSchemaOutput<SelectSchema<TTable>>>;
 
 /**
- * Creates the sync function with common lifecycle management
+ * Creates the sync function with common lifecycle management.
+ * Delegates to the generic (Drizzle-free) implementation in @firtoz/db-helpers.
  */
 export function createSyncFunction<TTable extends Table>(
 	config: BaseSyncConfig<TTable>,
 	backend: SyncBackend<TTable>,
 ): SyncFunctionResult<TTable> {
-	type ItemType = InferSchemaOutput<SelectSchema<TTable>>;
-	type CollectionType = CollectionConfig<
-		ItemType,
-		string,
-		// biome-ignore lint/suspicious/noExplicitAny: Schema type parameter needs to be flexible
-		any
-	>;
-
-	let insertListener: CollectionType["onInsert"];
-	let updateListener: CollectionType["onUpdate"];
-	let deleteListener: CollectionType["onDelete"];
-
-	// Captured sync functions for external sync
-	let syncBegin: (() => void) | null = null;
-	let syncWrite:
-		| ((op: { type: "insert" | "update" | "delete"; value: ItemType }) => void)
-		| null = null;
-	let syncCommit: (() => void) | null = null;
-	let syncTruncate: (() => void) | null = null;
-
-	const syncFn: SyncConfig<
-		InferSchemaOutput<SelectSchema<TTable>>,
-		string
-	>["sync"] = (params) => {
-		const { begin, write, commit, markReady, truncate } = params;
-
-		// Capture sync functions for external use
-		syncBegin = begin;
-		syncWrite = write;
-		syncCommit = commit;
-		syncTruncate = truncate;
-
-		const initialSync = async () => {
-			await config.readyPromise;
-
-			try {
-				const items = await backend.initialLoad();
-
-				begin();
-
-				for (const item of items) {
-					write({
-						type: "insert",
-						value: item,
-					});
-				}
-
-				commit();
-			} finally {
-				markReady();
-			}
-		};
-
-		if (config.syncMode === "eager" || !config.syncMode) {
-			initialSync();
-		} else {
-			markReady();
-		}
-
-		insertListener = async (params) => {
-			const results = await backend.handleInsert(
-				params.transaction.mutations.map((m) => m.modified),
-			);
-
-			begin();
-			for (const result of results) {
-				write({
-					type: "insert",
-					value: result,
-				});
-			}
-			commit();
-		};
-
-		updateListener = async (params) => {
-			const results = await backend.handleUpdate(params.transaction.mutations);
-
-			begin();
-			for (const result of results) {
-				write({
-					type: "update",
-					value: result,
-				});
-			}
-			commit();
-		};
-
-		deleteListener = async (params) => {
-			await backend.handleDelete(params.transaction.mutations);
-
-			begin();
-			for (const item of params.transaction.mutations) {
-				write({
-					type: "delete",
-					value: item.modified,
-				});
-			}
-			commit();
-		};
-
-		const loadSubset = async (options: LoadSubsetOptions) => {
-			await config.readyPromise;
-
-			const items = await backend.loadSubset(options);
-
-			begin();
-
-			for (const item of items) {
-				write({
-					type: "insert",
-					value: item,
-				});
-			}
-
-			commit();
-		};
-
-		// Create deduplicated loadSubset wrapper to avoid redundant queries
-		let loadSubsetDedupe: DeduplicatedLoadSubset | null = null;
-		if (USE_DEDUPE) {
-			loadSubsetDedupe = new DeduplicatedLoadSubset({
-				loadSubset,
-			});
-		}
-
-		return {
-			cleanup: () => {
-				insertListener = undefined;
-				updateListener = undefined;
-				deleteListener = undefined;
-				loadSubsetDedupe?.reset();
-			},
-			loadSubset: loadSubsetDedupe?.loadSubset ?? loadSubset,
-		} satisfies SyncConfigRes;
-	};
-
-	// Apply SyncMessage[] to the sync layer (canonical receive API)
-	const receiveSync = async (messages: SyncMessage<ItemType>[]) => {
-		if (messages.length === 0) return;
-		if (!syncBegin || !syncWrite || !syncCommit || !syncTruncate) {
-			if (config.debug) {
-				console.warn(
-					"[receiveSync] Sync functions not initialized yet - messages will be dropped",
-					messages.length,
-				);
-			}
-			return;
-		}
-		syncBegin();
-		for (const msg of messages) {
-			switch (msg.type) {
-				case "insert":
-					syncWrite({ type: "insert", value: msg.value });
-					break;
-				case "update":
-					syncWrite({ type: "update", value: msg.value });
-					break;
-				case "delete":
-					syncWrite({
-						type: "delete",
-						value: { id: msg.key } as ItemType,
-					});
-					break;
-				case "truncate":
-					syncTruncate();
-					break;
-				default:
-					exhaustiveGuard(msg);
-			}
-		}
-		syncCommit();
-	};
-
-	// Create utils with truncate and receiveSync
-	const utils: CollectionUtils<ItemType> = {
-		truncate: async () => {
-			if (!backend.handleTruncate) {
-				throw new Error("Truncate not supported by this backend");
-			}
-			if (!syncBegin || !syncTruncate || !syncCommit) {
-				throw new Error(
-					"Sync functions not initialized - sync function may not have been called yet",
-				);
-			}
-			// Clear the backend store
-			await backend.handleTruncate();
-			// Update local reactive store (same pattern as insert/update/delete listeners)
-			syncBegin();
-			syncTruncate();
-			syncCommit();
-		},
-		receiveSync,
-	};
-
-	return {
-		sync: syncFn,
-		onInsert: async (params) => {
-			if (!insertListener) {
-				throw new Error(
-					"insertListener not initialized - sync function may not have been called yet",
-				);
-			}
-			return insertListener(params);
-		},
-		onUpdate: async (params) => {
-			if (!updateListener) {
-				throw new Error(
-					"updateListener not initialized - sync function may not have been called yet",
-				);
-			}
-			return updateListener(params);
-		},
-		onDelete: async (params) => {
-			if (!deleteListener) {
-				throw new Error(
-					"deleteListener not initialized - sync function may not have been called yet",
-				);
-			}
-			return deleteListener(params);
-		},
-		utils,
-	};
+	return createGenericSyncFunction(config, backend);
 }
 
 /**
@@ -529,8 +234,8 @@ export function createGetKeyFunction<TTable extends Table>() {
 }
 
 /**
- * Base collection config factory
- * Combines schema, sync, and event handlers into a collection config
+ * Base collection config factory.
+ * Delegates to the generic (Drizzle-free) implementation in @firtoz/db-helpers.
  */
 export function createCollectionConfig<
 	TTable extends Table,
@@ -570,18 +275,19 @@ export function createCollectionConfig<
 	schema: TSchema;
 	utils: CollectionUtils<InferSchemaOutput<SelectSchema<TTable>>>;
 } {
-	return {
-		schema: config.schema,
-		getKey: config.getKey,
-		sync: {
-			sync: config.syncResult.sync,
-		},
-		// Merge provided handlers with sync result handlers (provided handlers take precedence)
-		onInsert: config.onInsert ?? config.syncResult.onInsert,
-		onUpdate: config.onUpdate ?? config.syncResult.onUpdate,
-		onDelete: config.onDelete ?? config.syncResult.onDelete,
-		syncMode: config.syncMode,
-		// Include utils with truncate and receiveSync
-		utils: config.syncResult.utils,
+	type TItem = InferSchemaOutput<SelectSchema<TTable>>;
+	type ReturnType = Omit<
+		CollectionConfig<
+			TItem,
+			string,
+			// biome-ignore lint/suspicious/noExplicitAny: Schema type parameter needs to be flexible
+			any
+		>,
+		"utils"
+	> & {
+		schema: TSchema;
+		utils: CollectionUtils<TItem>;
 	};
+
+	return createGenericCollectionConfig<TItem, TSchema>(config) as ReturnType;
 }