ENG-633 Refactor: Move some functions to packages/database (#356)

* Code refactor: Move db utilities to database, and other to utils

* various corrections from coderabbit

* use type import on dbTypes (except constant). repo/database is a runtime dependency for roam

Author: maparent

apps/roam/package.json

@@ -13,7 +13,6 @@
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@repo/database": "*",
     "@repo/tailwind-config": "*",
     "@types/contrast-color": "^1.0.0",
     "@types/react-vertical-timeline-component": "^3.3.3",
@@ -30,6 +29,7 @@
   "dependencies": {
     "@octokit/auth-app": "^7.1.4",
     "@octokit/core": "^6.1.3",
+    "@repo/database": "*",
     "@repo/types": "*",
     "tldraw": "2.3.0",
     "@vercel/blob": "^0.27.0",

apps/roam/src/utils/supabaseContext.ts

@@ -3,16 +3,16 @@ import getCurrentUserDisplayName from "roamjs-components/queries/getCurrentUserD
 import getPageUidByPageTitle from "roamjs-components/queries/getPageUidByPageTitle";
 import getRoamUrl from "roamjs-components/dom/getRoamUrl";
 
-import { Enums } from "@repo/database/types.gen";
+import type { Enums } from "@repo/database/dbTypes";
 import { DISCOURSE_CONFIG_PAGE_TITLE } from "~/utils/renderNodeConfigPage";
 import getBlockProps from "~/utils/getBlockProps";
 import setBlockProps from "~/utils/setBlockProps";
-import { type DGSupabaseClient } from "@repo/ui/lib/supabase/client";
+import type { DGSupabaseClient } from "@repo/database/lib/client";
 import {
   fetchOrCreateSpaceDirect,
   fetchOrCreatePlatformAccount,
   createLoggedInClient,
-} from "@repo/ui/lib/supabase/contextFunctions";
+} from "@repo/database/lib/contextFunctions";
 
 declare const crypto: { randomUUID: () => string };
 

apps/website/app/api/supabase/agent-identifier/route.ts

@@ -2,13 +2,13 @@ import { NextResponse, NextRequest } from "next/server";
 
 import { createClient } from "~/utils/supabase/server";
 import { getOrCreateEntity, ItemValidator } from "~/utils/supabase/dbUtils";
+import { asPostgrestFailure } from "@repo/database/lib/contextFunctions";
 import {
   createApiResponse,
   handleRouteError,
   defaultOptionsHandler,
-  asPostgrestFailure,
 } from "~/utils/supabase/apiUtils";
-import { TablesInsert, Constants } from "@repo/database/types.gen.ts";
+import { type TablesInsert, Constants } from "@repo/database/dbTypes";
 
 type AgentIdentifierDataInput = TablesInsert<"AgentIdentifier">;
 const { AgentIdentifierType } = Constants.public.Enums;

apps/website/app/api/supabase/content-embedding/batch/route.ts

@@ -2,11 +2,11 @@ import { NextResponse, NextRequest } from "next/server";
 import type { PostgrestResponse } from "@supabase/supabase-js";
 
 import { createClient } from "~/utils/supabase/server";
+import { asPostgrestFailure } from "@repo/database/lib/contextFunctions";
 import {
   createApiResponse,
   handleRouteError,
   defaultOptionsHandler,
-  asPostgrestFailure,
 } from "~/utils/supabase/apiUtils";
 import {
   processAndInsertBatch,

apps/website/app/api/supabase/content-embedding/route.ts

@@ -2,11 +2,11 @@ import { NextResponse, NextRequest } from "next/server";
 import type { PostgrestSingleResponse } from "@supabase/supabase-js";
 
 import { createClient } from "~/utils/supabase/server";
+import { asPostgrestFailure } from "@repo/database/lib/contextFunctions";
 import {
   createApiResponse,
   handleRouteError,
   defaultOptionsHandler,
-  asPostgrestFailure,
 } from "~/utils/supabase/apiUtils";
 import {
   getOrCreateEntity,

apps/website/app/api/supabase/content/batch/route.ts

@@ -1,11 +1,11 @@
 import { NextResponse, NextRequest } from "next/server";
 import type { PostgrestResponse } from "@supabase/supabase-js";
 import { createClient } from "~/utils/supabase/server";
+import { asPostgrestFailure } from "@repo/database/lib/contextFunctions";
 import {
   createApiResponse,
   handleRouteError,
   defaultOptionsHandler,
-  asPostgrestFailure,
 } from "~/utils/supabase/apiUtils";
 import { validateAndInsertBatch } from "~/utils/supabase/dbUtils";
 import {

apps/website/app/api/supabase/content/route.ts

@@ -3,14 +3,14 @@ import type { PostgrestSingleResponse } from "@supabase/supabase-js";
 
 import { createClient } from "~/utils/supabase/server";
 import { getOrCreateEntity } from "~/utils/supabase/dbUtils";
+import { asPostgrestFailure } from "@repo/database/lib/contextFunctions";
 import {
   createApiResponse,
   handleRouteError,
   defaultOptionsHandler,
-  asPostgrestFailure,
 } from "~/utils/supabase/apiUtils";
 import { contentInputValidation } from "~/utils/supabase/validators";
-import { Tables, TablesInsert } from "@repo/database/types.gen.ts";
+import type { Tables, TablesInsert } from "@repo/database/dbTypes";
 
 type ContentDataInput = TablesInsert<"Content">;
 type ContentRecord = Tables<"Content">;

apps/website/app/api/supabase/document/route.ts

@@ -3,13 +3,13 @@ import type { PostgrestSingleResponse } from "@supabase/supabase-js";
 
 import { createClient } from "~/utils/supabase/server";
 import { getOrCreateEntity, ItemValidator } from "~/utils/supabase/dbUtils";
+import { asPostgrestFailure } from "@repo/database/lib/contextFunctions";
 import {
   createApiResponse,
   handleRouteError,
   defaultOptionsHandler,
-  asPostgrestFailure,
 } from "~/utils/supabase/apiUtils";
-import { Tables, TablesInsert } from "@repo/database/types.gen.ts";
+import type { Tables, TablesInsert } from "@repo/database/dbTypes";
 
 type DocumentDataInput = TablesInsert<"Document">;
 type DocumentRecord = Tables<"Document">;

apps/website/app/api/supabase/platform-account/route.ts

@@ -2,13 +2,13 @@ import { NextResponse, NextRequest } from "next/server";
 
 import { createClient } from "~/utils/supabase/server";
 import { getOrCreateEntity, ItemValidator } from "~/utils/supabase/dbUtils";
+import { asPostgrestFailure } from "@repo/database/lib/contextFunctions";
 import {
   createApiResponse,
   handleRouteError,
   defaultOptionsHandler,
-  asPostgrestFailure,
 } from "~/utils/supabase/apiUtils";
-import { TablesInsert, Constants } from "@repo/database/types.gen.ts";
+import { type TablesInsert, Constants } from "@repo/database/dbTypes";
 
 const { AgentType, Platform } = Constants.public.Enums;
 

apps/website/app/api/supabase/similarity-rank/route.ts

@@ -1,10 +1,10 @@
 import { NextResponse, NextRequest } from "next/server";
 import { createClient } from "~/utils/supabase/server";
+import { asPostgrestFailure } from "@repo/database/lib/contextFunctions";
 import {
   createApiResponse,
   handleRouteError,
   defaultOptionsHandler,
-  asPostgrestFailure,
 } from "~/utils/supabase/apiUtils";
 
 type SimilarityRankInput = {