docs(changeset):

fix: 5.8.3 is preferred Typescript version rn
fix: added error handling to filesWithTags. improved query consitency

Author: bauchdj

.changeset/soft-chicken-work.md

@@ -0,0 +1,5 @@
+---
+"@nimbus/server": patch
+---
+
+fix: 5.8.3 is preferred Typescript version rn fix: added error handling to filesWithTags. improved query consitency

apps/server/src/routes/files/file-service.ts

@@ -43,12 +43,17 @@ export class FileService {
 			return null;
 		}
 
-		// Add tags to files
+		// Add tags to files, handling any tag retrieval failures
 		const filesWithTags = await Promise.all(
 			res.items.map(async item => {
 				if (!item.id) return { ...item, tags: [] };
-				const tags = await this.tagService.getFileTags(item.id, user.id);
-				return { ...item, tags };
+				try {
+					const tags = await this.tagService.getFileTags(item.id, user.id);
+					return { ...item, tags };
+				} catch (error) {
+					console.error(`Failed to get tags for file ${item.id}:`, error);
+					return { ...item, tags: [] };
+				}
 			})
 		);
 

apps/server/src/routes/tags/tag-service.ts

@@ -16,7 +16,10 @@ export class TagService {
 	// Get all tags for a user with file counts
 	async getUserTags(userId: string): Promise<Tag[]> {
 		// Get all tags for the user
-		const userTags = await this.c.var.db.select().from(tag).where(eq(tag.userId, userId)).orderBy(tag.name);
+		const userTags = await this.c.var.db.query.tag.findMany({
+			where: (table, { eq }) => eq(table.userId, userId),
+			orderBy: (table, { asc }) => asc(table.name),
+		});
 
 		// Get file counts for each tag
 		const tagsWithCounts = await Promise.all(
@@ -42,22 +45,17 @@ export class TagService {
 
 	// Get a specific tag by ID
 	async getTagById(tagId: string, userId: string): Promise<Tag | null> {
-		const tagRecord = await this.c.var.db
-			.select()
-			.from(tag)
-			.where(and(eq(tag.id, tagId), eq(tag.userId, userId)))
-			.limit(1);
+		const record = await this.c.var.db.query.tag.findFirst({
+			where: (table, { and, eq }) => and(eq(table.id, tagId), eq(table.userId, userId)),
+		});
 
-		if (!tagRecord.length) return null;
+		if (!record) return null;
 
 		const fileCount = await this.c.var.db
 			.select({ count: count() })
 			.from(fileTag)
 			.where(and(eq(fileTag.tagId, tagId), eq(fileTag.userId, userId)));
 
-		const record = tagRecord[0];
-		if (!record) return null;
-
 		return {
 			id: record.id,
 			name: record.name,
@@ -85,9 +83,11 @@ export class TagService {
 			? and(eq(tag.name, name), eq(tag.userId, userId), eq(tag.parentId, parentId))
 			: and(eq(tag.name, name), eq(tag.userId, userId), isNull(tag.parentId));
 
-		const existingTag = await this.c.var.db.select().from(tag).where(existingTagQuery).limit(1);
+		const existingTag = await this.c.var.db.query.tag.findFirst({
+			where: existingTagQuery,
+		});
 
-		if (existingTag.length > 0) {
+		if (existingTag) {
 			throw new Error("Tag with this name already exists");
 		}
 
@@ -140,9 +140,11 @@ export class TagService {
 				? and(eq(tag.name, updates.name), eq(tag.userId, userId), eq(tag.parentId, newParentId))
 				: and(eq(tag.name, updates.name), eq(tag.userId, userId), isNull(tag.parentId));
 
-			const nameConflict = await this.c.var.db.select().from(tag).where(nameConflictQuery).limit(1);
+			const nameConflict = await this.c.var.db.query.tag.findFirst({
+				where: nameConflictQuery,
+			});
 
-			if (nameConflict.length > 0) {
+			if (nameConflict) {
 				throw new Error("Tag with this name already exists");
 			}
 		}
@@ -191,10 +193,10 @@ export class TagService {
 		}
 
 		// Check for existing associations
-		const existingAssociations = await this.c.var.db
-			.select()
-			.from(fileTag)
-			.where(and(eq(fileTag.fileId, fileId), inArray(fileTag.tagId, tagIds), eq(fileTag.userId, userId)));
+		const existingAssociations = await this.c.var.db.query.fileTag.findMany({
+			where: (table, { and, eq, inArray }) =>
+				and(eq(table.fileId, fileId), inArray(table.tagId, tagIds), eq(table.userId, userId)),
+		});
 
 		const existingTagIds = existingAssociations.map(assoc => assoc.tagId);
 		const newTagIds = tagIds.filter(tagId => !existingTagIds.includes(tagId));
@@ -239,21 +241,17 @@ export class TagService {
 
 	// Get all tags for a specific file
 	async getFileTags(fileId: string, userId: string): Promise<Tag[]> {
-		const fileTagAssociations = await this.c.var.db
-			.select({
-				tagId: fileTag.tagId,
-			})
-			.from(fileTag)
-			.where(and(eq(fileTag.fileId, fileId), eq(fileTag.userId, userId)));
+		const fileTagAssociations = await this.c.var.db.query.fileTag.findMany({
+			where: (table, { and, eq }) => and(eq(table.fileId, fileId), eq(table.userId, userId)),
+		});
 
 		const tagIds = fileTagAssociations.map(assoc => assoc.tagId);
 
 		if (tagIds.length === 0) return [];
 
-		const tags = await this.c.var.db
-			.select()
-			.from(tag)
-			.where(and(inArray(tag.id, tagIds), eq(tag.userId, userId)));
+		const tags = await this.c.var.db.query.tag.findMany({
+			where: (table, { and, inArray, eq }) => and(inArray(table.id, tagIds), eq(table.userId, userId)),
+		});
 
 		return tags.map(tagRecord => ({
 			...tagRecord,
@@ -265,10 +263,9 @@ export class TagService {
 
 	// Get all child tag IDs recursively
 	private async getAllChildTagIds(parentId: string, userId: string): Promise<string[]> {
-		const childTags = await this.c.var.db
-			.select({ id: tag.id })
-			.from(tag)
-			.where(and(eq(tag.parentId, parentId), eq(tag.userId, userId)));
+		const childTags = await this.c.var.db.query.tag.findMany({
+			where: (table, { and, eq }) => and(eq(table.parentId, parentId), eq(table.userId, userId)),
+		});
 
 		const childIds = childTags.map(tag => tag.id);
 		const grandChildIds = await Promise.all(childIds.map(childId => this.getAllChildTagIds(childId, userId)));

apps/server/src/routes/waitlist/index.ts

@@ -3,7 +3,7 @@ import { sendError, sendSuccess } from "../utils";
 import { zValidator } from "@hono/zod-validator";
 import { createPublicRouter } from "../../hono";
 import { waitlist } from "@nimbus/db/schema";
-import { count, eq } from "drizzle-orm";
+import { count } from "drizzle-orm";
 import { nanoid } from "nanoid";
 
 const waitlistRouter = createPublicRouter()
@@ -29,12 +29,9 @@ const waitlistRouter = createPublicRouter()
 			try {
 				const email = c.req.valid("json").email;
 
-				const existing = await c.var.db
-					.select()
-					.from(waitlist)
-					.where(eq(waitlist.email, email.toLowerCase().trim()))
-					.limit(1)
-					.then(rows => rows[0]);
+				const existing = await c.var.db.query.waitlist.findFirst({
+					where: (table, { eq }) => eq(table.email, email.toLowerCase().trim()),
+				});
 
 				if (existing) {
 					return sendError(c, { message: "This email is already on the waitlist", status: 400 });

bun.lock

@@ -937,7 +937,7 @@
 
     "@tanstack/query-core": ["@tanstack/[email protected]", "", {}, "sha512-OG69LQgT7jSp+5pPuCfzltq/+7l2xoweggjme9vlbCPa/d7D7zaqv5vN/S82SzSYZ4EDLTxNO1PWrv49RAS64Q=="],
 
-    "@tanstack/react-query": ["@tanstack/react-query@5.83.1", "", { "dependencies": { "@tanstack/query-core": "5.83.1" }, "peerDependencies": { "react": "^18 || ^19" } }, "sha512-JHZ3xox3p0sqCgM7ykBRtMWSLmWgjR7I+oJMAZ1beK/O/gfShI2b/PdovL2/ivVLUZklXgBenQu4ZjPhIM+yrw=="],
+    "@tanstack/react-query": ["@tanstack/react-query@5.84.0", "", { "dependencies": { "@tanstack/query-core": "5.83.1" }, "peerDependencies": { "react": "^18 || ^19" } }, "sha512-iPycFGLq5lltDE16Jf13Nx7SOvtfoopfOH/+Ahbdd+z4QqOfYu/SOkY86AVYVcKjneuqPxTm8e85lSGhwe0cog=="],
 
     "@tanstack/react-table": ["@tanstack/[email protected]", "", { "dependencies": { "@tanstack/table-core": "8.21.3" }, "peerDependencies": { "react": ">=16.8", "react-dom": ">=16.8" } }, "sha512-5nNMTSETP4ykGegmVkhjcS8tTLW6Vl4axfEGQN3v0zdHYbK4UfoqfPChclTrJ4EoK9QynqAu9oUf8VEmrpZ5Ww=="],
 
@@ -2229,7 +2229,7 @@
 
     "typed-array-length": ["[email protected]", "", { "dependencies": { "call-bind": "^1.0.7", "for-each": "^0.3.3", "gopd": "^1.0.1", "is-typed-array": "^1.1.13", "possible-typed-array-names": "^1.0.0", "reflect.getprototypeof": "^1.0.6" } }, "sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg=="],
 
-    "typescript": ["typescript@5.9.2", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A=="],
+    "typescript": ["typescript@5.8.3", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A=="],
 
     "typescript-eslint": ["[email protected]", "", { "dependencies": { "@typescript-eslint/eslint-plugin": "8.38.0", "@typescript-eslint/parser": "8.38.0", "@typescript-eslint/typescript-estree": "8.38.0", "@typescript-eslint/utils": "8.38.0" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", "typescript": ">=4.8.4 <5.9.0" } }, "sha512-FsZlrYK6bPDGoLeZRuvx2v6qrM03I0U0SnfCLPs/XCCPCFD80xU9Pg09H/K+XFa68uJuZo7l/Xhs+eDRg2l3hg=="],
 
@@ -2345,12 +2345,8 @@
 
     "@aws-crypto/sha1-browser/@aws-sdk/types": ["@aws-sdk/[email protected]", "", { "dependencies": { "@smithy/types": "^4.3.1", "tslib": "^2.6.2" } }, "sha512-xliuHaUFZxEx1NSXeLLZ9Dyu6+EJVQKEoD+yM+zqUo3YDZ7medKJWY6fIOKiPX/N7XbLdBYwajb15Q7IL8KkeA=="],
 
-    "@aws-crypto/sha256-browser/@aws-sdk/types": ["@aws-sdk/[email protected]", "", { "dependencies": { "@smithy/types": "^4.3.1", "tslib": "^2.6.2" } }, "sha512-xliuHaUFZxEx1NSXeLLZ9Dyu6+EJVQKEoD+yM+zqUo3YDZ7medKJWY6fIOKiPX/N7XbLdBYwajb15Q7IL8KkeA=="],
-
     "@aws-crypto/sha256-browser/tslib": ["[email protected]", "", {}, "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="],
 
-    "@aws-crypto/sha256-js/@aws-sdk/types": ["@aws-sdk/[email protected]", "", { "dependencies": { "@smithy/types": "^4.3.1", "tslib": "^2.6.2" } }, "sha512-xliuHaUFZxEx1NSXeLLZ9Dyu6+EJVQKEoD+yM+zqUo3YDZ7medKJWY6fIOKiPX/N7XbLdBYwajb15Q7IL8KkeA=="],
-
     "@aws-crypto/sha256-js/tslib": ["[email protected]", "", {}, "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="],
 
     "@aws-crypto/supports-web-crypto/tslib": ["[email protected]", "", {}, "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="],
@@ -3083,14 +3079,6 @@
 
     "@aws-crypto/sha1-browser/@aws-sdk/types/@smithy/types": ["@smithy/[email protected]", "", { "dependencies": { "tslib": "^2.6.2" } }, "sha512-UqKOQBL2x6+HWl3P+3QqFD4ncKq0I8Nuz9QItGv5WuKuMHuuwlhvqcZCoXGfc+P1QmfJE7VieykoYYmrOoFJxA=="],
 
-    "@aws-crypto/sha256-browser/@aws-sdk/types/@smithy/types": ["@smithy/[email protected]", "", { "dependencies": { "tslib": "^2.6.2" } }, "sha512-UqKOQBL2x6+HWl3P+3QqFD4ncKq0I8Nuz9QItGv5WuKuMHuuwlhvqcZCoXGfc+P1QmfJE7VieykoYYmrOoFJxA=="],
-
-    "@aws-crypto/sha256-browser/@aws-sdk/types/tslib": ["[email protected]", "", {}, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="],
-
-    "@aws-crypto/sha256-js/@aws-sdk/types/@smithy/types": ["@smithy/[email protected]", "", { "dependencies": { "tslib": "^2.6.2" } }, "sha512-UqKOQBL2x6+HWl3P+3QqFD4ncKq0I8Nuz9QItGv5WuKuMHuuwlhvqcZCoXGfc+P1QmfJE7VieykoYYmrOoFJxA=="],
-
-    "@aws-crypto/sha256-js/@aws-sdk/types/tslib": ["[email protected]", "", {}, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="],
-
     "@aws-crypto/util/@aws-sdk/types/@smithy/types": ["@smithy/[email protected]", "", { "dependencies": { "tslib": "^2.6.2" } }, "sha512-UqKOQBL2x6+HWl3P+3QqFD4ncKq0I8Nuz9QItGv5WuKuMHuuwlhvqcZCoXGfc+P1QmfJE7VieykoYYmrOoFJxA=="],
 
     "@aws-crypto/util/@aws-sdk/types/tslib": ["[email protected]", "", {}, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="],