From e39924b236afde31e0d9577871050f645964c20b Mon Sep 17 00:00:00 2001 From: Flea Flicker Date: Sun, 5 Apr 2026 14:39:22 +0000 Subject: [PATCH] fix(api): import isNull from @groombook/db instead of drizzle-orm directly drizzle-orm is not a direct dependency of @groombook/api, causing TS2307 at typecheck time. Re-export isNull from @groombook/db and update the import in rbac.ts. Co-Authored-By: Paperclip --- apps/api/src/middleware/rbac.ts | 3 +-- packages/db/src/index.ts | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/apps/api/src/middleware/rbac.ts b/apps/api/src/middleware/rbac.ts index 9075ee9..1fab0cc 100644 --- a/apps/api/src/middleware/rbac.ts +++ b/apps/api/src/middleware/rbac.ts @@ -1,6 +1,5 @@ import type { MiddlewareHandler } from "hono"; -import { isNull } from "drizzle-orm"; -import { and, eq, getDb, staff } from "@groombook/db"; +import { and, eq, getDb, isNull, staff } from "@groombook/db"; export type StaffRole = "groomer" | "receptionist" | "manager"; export type StaffRow = typeof staff.$inferSelect; diff --git a/packages/db/src/index.ts b/packages/db/src/index.ts index 9cd8c01..8b3b01f 100644 --- a/packages/db/src/index.ts +++ b/packages/db/src/index.ts @@ -4,7 +4,7 @@ import * as schema from "./schema.js"; export * from "./schema.js"; export { encryptSecret, decryptSecret } from "./crypto.js"; -export { and, asc, desc, eq, exists, gte, gt, ilike, inArray, lt, lte, ne, or, sql } from "drizzle-orm"; +export { and, asc, desc, eq, exists, gte, gt, ilike, inArray, isNull, lt, lte, ne, or, sql } from "drizzle-orm"; let _db: ReturnType | null = null;