wip typing overhaul

apps/aitino/src/lib/server/db.ts

@@ -1,6 +1,8 @@
 import { supabase } from "$lib/supabase";
-import type { TablesInsert } from "$lib/supabase.types";
+import type { TablesInsert } from "$lib/types/supabase";
 import { error } from "@sveltejs/kit";
+import type { Maeve } from "$lib/types/models";
+import { getNodesCount } from "$lib/utils.js";
 
 export async function getMessages(session_id: string | null) {
 	if (!session_id) {
@@ -21,11 +23,33 @@ export async function getMessages(session_id: string | null) {
 	return data;
 }
 
-export async function postMaeve(data: TablesInsert<"maeve_nodes">) {
+export async function postMaeve(data: TablesInsert<"maeves">) {
 	localStorage.setItem("currentMeaveId", data.id);
-	return supabase.from("maeve_nodes").upsert(data);
+	return supabase.from("maeves").upsert(data);
 }
 
-export async function getMaeve(userId: string) {
-	return await supabase.from("maeve_nodes").select("*").eq("user_id", userId);
+export async function getMaeves(userId: string) {
+	const { data: data, error: err } = await supabase
+		.from("maeves")
+		.select("*")
+		.eq("user_id", userId);
+
+	let maeves: Maeve[] = [];
+
+	if (err) {
+		return maeves;
+	}
+
+	if (data.length === 0) {
+		return maeves;
+	}
+
+	for (let i = 0; i < data.length; i++) {
+		const maeve = data[i] as Maeve;
+		maeve.count = getNodesCount(maeve.nodes);
+
+		maeves = [...maeves, maeve];
+	}
+
+	return maeves;
 }

apps/aitino/src/lib/supabase.ts

@@ -1,6 +1,6 @@
 import { createClient } from "@supabase/supabase-js";
 import { PUBLIC_SUPABASE_URL, PUBLIC_SUPABASE_ANON_KEY } from "$env/static/public";
 
-import type { Database } from "$lib/supabase.types";
+import type { Database } from "$lib/types/supabase";
 
 export const supabase = createClient<Database>(PUBLIC_SUPABASE_URL, PUBLIC_SUPABASE_ANON_KEY);

apps/aitino/src/lib/types.ts

@@ -2,9 +2,9 @@ import type { Node } from "@xyflow/svelte";
 import type { Writable } from "svelte/store";
 
 import type { Variant } from "$lib/components/ui/button";
-import type { Tables } from "$lib/supabase.types";
+import type { Tables } from "$lib/types/supabase";
 
-export type Maeve = Tables<"maeve_nodes">;
+export type Maeve = Tables<"maeves">;
 
 export type SvelteEvent<E extends Event = Event, T extends EventTarget = Element> = E & {
 	currentTarget: EventTarget & T;

apps/aitino/src/lib/loads.ts → apps/aitino/src/lib/types/loads.ts

@@ -1,10 +1,14 @@
 // Contains types for +page.server.ts files data properties
 
-import * as models from "./models";
+import * as models from "$lib/types/models";
 
 export type SessionLoad = {
 	maeveId: string | null;
 	sessionId: string | null;
 	messages: models.Message[];
 	reply: string;
 };
+
+export type MaeveLoad = {
+	maeve: models.Maeve;
+};

apps/aitino/src/lib/types/models.ts

@@ -0,0 +1,29 @@
+import type { Edge, Node } from "@xyflow/svelte";
+
+export type Message = {
+	id: string;
+	session_id: string;
+	recipient: string;
+	content: string;
+	role: string;
+	name: string;
+	created_at: string;
+};
+
+export type Maeve = {
+	id: string;
+	profile_id: string;
+	reciever_id: string;
+	title: string;
+	description: string;
+	nodes: Node[];
+	edges: Edge[];
+	created_at: string;
+};
+
+export type Session = {
+	id: string;
+	maeve_id: string;
+	user_id: string;
+	created_at: string;
+};

apps/aitino/src/routes/app/editors/maeve/+page.server.ts

@@ -1,35 +1,28 @@
 import type { Edge, Node } from "@xyflow/svelte";
 
 import * as db from "$lib/server/db";
-import { getNodesCount } from "$lib/utils.js";
+import type { MaeveLoad } from "$lib/types/loads";
 import { error } from "@sveltejs/kit";
 
 export const load = async ({ locals: { userId } }) => {
-	const { data, error: err } = await db.getMaeve(userId);
-	if (err) {
-		throw error(500, "Failed attempt at retrieving maeve. Please reload the page.");
-	}
-
-	if (data.length === 0) {
-		return {
-			user_id: userId,
-			title: "Untitled maeve",
-			description: "No description",
+	const data: MaeveLoad = {
+		maeve: {
+			id: "",
+			profile_id: userId,
+			reciever_id: "",
+			title: "",
+			description: "",
 			nodes: [],
 			edges: [],
-			count: {
-				agents: 0,
-				prompts: 0
-			}
-		};
-	}
+			created_at: ""
+		}
+	};
 
-	const nodes = data[0].nodes as Node[];
+	const maeves = await db.getMaeves(userId);
 
-	return {
-		...data[0],
-		nodes,
-		edges: data[0].edges as Edge[],
-		count: getNodesCount(nodes)
-	};
+	if (maeves.length !== 0) {
+		data.maeve = maeves[0];
+	}
+
+	return data;
 };

apps/aitino/src/routes/app/sessions/+page.server.ts

@@ -1,13 +1,18 @@
 import * as db from "$lib/server/db";
-import type { SessionLoad } from "$lib/loads";
+import type { SessionLoad } from "$lib/types/loads";
 
-export const load = async () => {
+export const load = async ({ locals: { userId } }) => {
 	const data: SessionLoad = {
-		maeveId: localStorage.getItem("maeveId"),
-		sessionId: localStorage.getItem("sessionId"),
+		maeveId: null,
+		sessionId: null,
 		messages: [],
-		reply: localStorage.getItem("currentReply") || ""
+		reply: ""
 	};
 
+	const maeves = await db.getMaeves(userId);
+	if (maeves.length === 0) {
+		return data;
+	}
+	data.maeveId = maeves[0].id;
 	data.messages = await db.getMessages(data.sessionId);
 };

apps/aitino/src/routes/app/sessions/Message.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { User } from "lucide-svelte";
 	import SvelteMarkdown from "svelte-markdown";
-    import * as models from "$lib/models";
+	import * as models from "$lib/types/models";
 	export let message: models.Message;
 	function formatName(inputString: string): string {
 		return inputString

apps/aitino/update-supabase-types.sh

@@ -0,0 +1 @@
+pnpm dlx supabase gen types typescript --project-id "$PROJECT_REF" --schema public >src/lib/types/supabase.ts