diff --git a/packages/data-driver-postgres/package.json b/packages/data-driver-postgres/package.json
index 4970fa1237..98c9d8e45f 100644
--- a/packages/data-driver-postgres/package.json
+++ b/packages/data-driver-postgres/package.json
@@ -21,8 +21,10 @@
 		"dist"
 	],
 	"scripts": {
-		"build": "tsup src/index.ts --format=esm --dts",
-		"dev": "tsup src/index.ts --format=esm --dts --watch",
+		"build": "pnpm run '/^bundle|typecheck$/'",
+		"dev": "pnpm run bundle --watch",
+		"bundle": "tsup src/index.ts --format=esm --dts",
+		"typecheck": "tsc --noEmit",
 		"test": "vitest --watch=false",
 		"depcruise": "depcruise src --include-only '^src' -x test.ts --output-type dot | dot -T svg > dependency-graph.svg"
 	},
diff --git a/packages/data-sql/package.json b/packages/data-sql/package.json
index 5e1bab13e0..5e56131745 100644
--- a/packages/data-sql/package.json
+++ b/packages/data-sql/package.json
@@ -4,8 +4,10 @@
 	"type": "module",
 	"sideEffects": false,
 	"scripts": {
-		"build": "tsup src/index.ts --format=esm --dts",
-		"dev": "tsup src/index.ts --format=esm --dts --watch",
+		"build": "pnpm run '/^bundle|typecheck$/'",
+		"dev": "pnpm run bundle --watch",
+		"bundle": "tsup src/index.ts --format=esm --dts",
+		"typecheck": "tsc --noEmit",
 		"test": "vitest --watch=false",
 		"depcruise": "depcruise src --include-only '^src' -x test.ts --output-type dot | dot -T svg > dependency-graph.svg"
 	},
diff --git a/packages/data/package.json b/packages/data/package.json
index 2e09b9a8d6..13bdeff7f5 100644
--- a/packages/data/package.json
+++ b/packages/data/package.json
@@ -21,8 +21,10 @@
 		"dist"
 	],
 	"scripts": {
-		"build": "tsup src/index.ts --format=esm --dts",
-		"dev": "tsup src/index.ts --format=esm --dts --watch",
+		"build": "pnpm run '/^bundle|typecheck$/'",
+		"dev": "pnpm run bundle --watch",
+		"bundle": "tsup src/index.ts --format=esm --dts",
+		"typecheck": "tsc --noEmit",
 		"test": "vitest --watch=false",
 		"depcruise": "depcruise src --include-only '^src' -x test.ts --output-type dot | dot -T svg > dependency-graph.svg"
 	},
diff --git a/packages/data/src/engine.test.ts b/packages/data/src/engine.test.ts
index 95919f12f5..8b7b6e58ad 100644
--- a/packages/data/src/engine.test.ts
+++ b/packages/data/src/engine.test.ts
@@ -45,6 +45,7 @@ describe('#query', () => {
 			store: sample.mockStoreIdentifier,
 			collection: randomIdentifier(),
 			fields: [],
+			modifiers: {},
 		};
 
 		await engine.query(query);