harmonize on input types

Author: maparent

apps/roam/src/utils/syncDgNodesToSupabase.ts

@@ -19,12 +19,15 @@ import {
 import { fetchEmbeddingsForNodes } from "./upsertNodesAsContentWithEmbeddings";
 import { convertRoamNodeToLocalContent } from "./upsertNodesAsContentWithEmbeddings";
 import type { DGSupabaseClient } from "@repo/database/lib/client";
-import type { Json, CompositeTypes, Enums } from "@repo/database/dbTypes";
+import type { Json, Enums } from "@repo/database/dbTypes";
 import { render as renderToast } from "roamjs-components/components/Toast";
 import internalError from "~/utils/internalError";
-type LocalContentDataInput = Partial<CompositeTypes<"content_local_input">>;
-type AccountLocalInput = CompositeTypes<"account_local_input">;
 import { FatalError } from "@repo/database/lib/contextFunctions";
+import type {
+  LocalConceptDataInput,
+  LocalContentDataInput,
+  LocalAccountDataInput,
+} from "@repo/database/inputTypes";
 
 const SYNC_FUNCTION = "embedding";
 // Minimal interval between syncs of all clients for this task.
@@ -42,8 +45,6 @@ type SyncTaskInfo = {
   shouldProceed: boolean;
 };
 
-type LocalConceptDataInput = Partial<CompositeTypes<"concept_local_input">>;
-
 const chunk = <T>(array: T[], size: number): T[][] => {
   const chunks: T[][] = [];
   for (let i = 0; i < array.length; i += size) {
@@ -388,7 +389,7 @@ export const upsertNodesToSupabaseAsContentWithEmbeddings = async (
   await uploadBatches(chunk(nodesWithEmbeddings, BATCH_SIZE));
 };
 
-const getAllUsers = async (): Promise<AccountLocalInput[]> => {
+const getAllUsers = async (): Promise<LocalAccountDataInput[]> => {
   const query = `[:find ?author_local_id ?author_name
   :keys author_local_id name
   :where
@@ -412,7 +413,7 @@ const getAllUsers = async (): Promise<AccountLocalInput[]> => {
 };
 
 const upsertUsers = async (
-  users: AccountLocalInput[],
+  users: LocalAccountDataInput[],
   supabaseClient: DGSupabaseClient,
   context: SupabaseContext,
 ) => {

apps/roam/src/utils/upsertNodesAsContentWithEmbeddings.ts

@@ -2,9 +2,8 @@ import { type RoamDiscourseNodeData } from "./getAllDiscourseNodesSince";
 import { type SupabaseContext } from "./supabaseContext";
 import { nextApiRoot } from "@repo/utils/execContext";
 import type { DGSupabaseClient } from "@repo/database/lib/client";
-import type { Json, CompositeTypes } from "@repo/database/dbTypes";
-
-type LocalContentDataInput = Partial<CompositeTypes<"content_local_input">>;
+import type { Json } from "@repo/database/dbTypes";
+import type { LocalContentDataInput } from "@repo/database/inputTypes";
 
 const EMBEDDING_BATCH_SIZE = 200;
 const EMBEDDING_MODEL = "openai_text_embedding_3_small_1536";