From 51b14c8b2b8f85f11f90987b28afd487030a5d1c Mon Sep 17 00:00:00 2001 From: Avraham Sakal Date: Sun, 21 Sep 2025 14:33:36 -0400 Subject: [PATCH] fix: build errors (couldn't find package) --- pages/chat/@id/+Page.tsx | 4 ++-- server/trpc-handler.ts | 6 +++--- server/trpc/chat.ts | 6 +++--- server/trpc/fact-triggers.ts | 12 ++++-------- server/trpc/facts.ts | 4 ++-- server/trpc/messages.ts | 6 +----- tsconfig.json | 3 ++- 7 files changed, 17 insertions(+), 24 deletions(-) diff --git a/pages/chat/@id/+Page.tsx b/pages/chat/@id/+Page.tsx index cc0d951..d5d2177 100644 --- a/pages/chat/@id/+Page.tsx +++ b/pages/chat/@id/+Page.tsx @@ -29,7 +29,7 @@ import type { OtherParameters, SendMessageStatus, SendMessageStatusUI, -} from "@/types"; +} from "../../../types"; import Markdown from "react-markdown"; import { IconTrash, @@ -40,7 +40,7 @@ import { } from "@tabler/icons-react"; import { useTRPC, useTRPCClient } from "../../trpc-client"; import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query"; -import type { Conversation } from "@/database/common"; +import type { Conversation } from "@database/common"; export default function ChatPage() { const pageContext = usePageContext(); diff --git a/server/trpc-handler.ts b/server/trpc-handler.ts index 9d33116..3a66276 100644 --- a/server/trpc-handler.ts +++ b/server/trpc-handler.ts @@ -1,4 +1,4 @@ -import { appRouter } from "@/server/trpc/router.js"; +import { appRouter } from "./trpc/router"; // TODO: stop using universal-middleware and directly integrate server middlewares instead and/or use vike-server https://vike.dev/server. (Bati generates boilerplates that use universal-middleware https://github.com/magne4000/universal-middleware to make Bati's internal logic easier. This is temporary and will be removed soon.) import { type Get, @@ -6,8 +6,8 @@ import { env as getEnv, } from "@universal-middleware/core"; import { fetchRequestHandler } from "@trpc/server/adapters/fetch"; -import { getDb, getDbClient } from "@/database/postgres"; -import { getOpenrouter } from "@/server/provider.js"; +import { getDb, getDbClient } from "../database/postgres"; +import { getOpenrouter } from "./provider.js"; import { env as processEnv } from "./env.js"; import { getToken } from "@auth/core/jwt"; diff --git a/server/trpc/chat.ts b/server/trpc/chat.ts index 4ed62ca..246d21d 100644 --- a/server/trpc/chat.ts +++ b/server/trpc/chat.ts @@ -4,7 +4,7 @@ import type { OtherParameters, CommittedMessage, DraftMessage, -} from "@/types.js"; +} from "../../types.js"; // import { client } from "../../database/milvus"; // import { // ConsistencyLevelEnum, @@ -16,8 +16,8 @@ import { facts, createCaller as createCallerFacts } from "./facts.js"; import { createCaller as createCallerMessages } from "./messages.js"; import { createCaller as createCallerFactTriggers } from "./fact-triggers.js"; import { factTriggers } from "./fact-triggers.js"; -import { MODEL_NAME } from "@/server/provider.js"; -import type { Fact, FactTrigger } from "@/database/common.js"; +import { MODEL_NAME } from "../provider.js"; +import type { Fact, FactTrigger } from "@database/common"; const mainSystemPrompt = ({ systemPrompt, diff --git a/server/trpc/fact-triggers.ts b/server/trpc/fact-triggers.ts index bb3ab2f..91995d6 100644 --- a/server/trpc/fact-triggers.ts +++ b/server/trpc/fact-triggers.ts @@ -1,12 +1,8 @@ -import { - router, - publicProcedure, - createCallerFactory, -} from "@/server/trpc/server.js"; -import type { DraftMessage } from "@/types.js"; -import { MODEL_NAME } from "@/server/provider.js"; +import { router, publicProcedure, createCallerFactory } from "./server.js"; +import type { DraftMessage } from "../../types.js"; +import { MODEL_NAME } from "../provider.js"; import { generateObject, generateText, jsonSchema } from "ai"; -import type { Fact } from "@/database/common.js"; +import type { Fact } from "@database/common.js"; const factTriggersSystemPrompt = ({ previousRunningSummary, diff --git a/server/trpc/facts.ts b/server/trpc/facts.ts index 6949646..4baa691 100644 --- a/server/trpc/facts.ts +++ b/server/trpc/facts.ts @@ -1,6 +1,6 @@ import { router, publicProcedure, createCallerFactory } from "./server.js"; -import type { DraftMessage } from "@/types.js"; -import { MODEL_NAME, openrouter } from "@/server/provider.js"; +import type { DraftMessage } from "../../types.js"; +import { MODEL_NAME, openrouter } from "../provider.js"; import { generateObject, generateText, jsonSchema } from "ai"; const factsFromNewMessagesSystemPrompt = ({ diff --git a/server/trpc/messages.ts b/server/trpc/messages.ts index 10c3887..45f47af 100644 --- a/server/trpc/messages.ts +++ b/server/trpc/messages.ts @@ -1,8 +1,4 @@ -import { - router, - publicProcedure, - createCallerFactory, -} from "@/server/trpc/server"; +import { router, publicProcedure, createCallerFactory } from "./server"; import { MODEL_NAME } from "../provider.js"; import { generateObject, generateText, jsonSchema } from "ai"; import type { DraftMessage } from "../../types.js"; diff --git a/tsconfig.json b/tsconfig.json index dd5332d..5c71350 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -15,7 +15,8 @@ "jsx": "react-jsx", "jsxImportSource": "react", "paths": { - "@/*": ["./*"] + "@database/*": ["./database/*"], + "@server/*": ["./server/*"] } }, "exclude": ["dist"]