feat: move server routes into src/server

.prettierrc.cjs

@@ -9,7 +9,7 @@ module.exports = {
   bracketSameLine: false,
   arrowParens: 'always',
   trailingComma: 'none',
-  importOrder: ['^node:.*', '<THIRD_PARTY_MODULES>', '^(@/(.*)$)', '^[./]'],
+  importOrder: ['^node:.*', '<THIRD_PARTY_MODULES>', '^(~/(.*)$)', '^[./]'],
   importOrderSeparation: true,
   importOrderSortSpecifiers: true,
   importOrderGroupNamespaceSpecifiers: true

src/lib/create-thread.ts

@@ -2,7 +2,8 @@ import type { z } from '@hono/zod-openapi'
 import createError from 'http-errors'
 import pMap from 'p-map'
 
-import * as routes from '../generated/oai-routes'
+import * as routes from '~/generated/oai-routes'
+
 import * as utils from './utils'
 import { prisma } from './db'
 

src/lib/oai.test.ts

@@ -2,7 +2,8 @@ import type * as prisma from '@prisma/client'
 import type { z } from '@hono/zod-openapi'
 import { describe, expectTypeOf, it } from 'vitest'
 
-import type * as oai from '../generated/oai'
+import type * as oai from '~/generated/oai'
+
 import type { OAITypeToPrismaType, PrismaTypeToOAIType } from './utils'
 
 describe('Assistant', () => {

src/lib/prisma-json-types.d.ts

@@ -1,6 +1,6 @@
 import type { JsonifiableObject } from 'type-fest'
 
-import type * as oai from '../generated/oai'
+import type * as oai from '~/generated/oai'
 
 declare global {
   /**

src/lib/utils.ts

@@ -6,7 +6,8 @@ import type { Simplify } from 'type-fest'
 import {
   type FluffyAssistantTools,
   type RunStepDetailsToolCallsObject
-} from '../generated/oai'
+} from '~/generated/oai'
+
 import '../prisma-json-types.d.ts'
 
 export type OAITypeToPrismaType<T extends Record<string, unknown>> = Simplify<

src/runner/index.ts

@@ -2,16 +2,17 @@ import { Msg, type Prompt, extractJsonObject } from '@dexaai/dexter/prompt'
 import { Worker } from 'bullmq'
 import { asyncExitHook } from 'exit-hook'
 import pMap from 'p-map'
-import type { RunStepDetailsToolCallsObject } from 'src/generated/oai'
+
+import * as config from '~/lib/config'
+import type { RunStepDetailsToolCallsObject } from '~/generated/oai'
+import { type Run, type RunStep, prisma } from '~/lib/db'
+import type { JobData, JobResult } from '~/lib/types'
 import {
   convertAssistantToolCallsToChatMessage,
   convertAssistantToolsToChatMessageTools,
   deepMergeArray
-} from 'src/lib/utils'
+} from '~/lib/utils'
 
-import * as config from '../lib/config'
-import { type Run, prisma } from '../lib/db'
-import type { JobData, JobResult } from '../lib/types'
 import { chatModel } from './models'
 
 export const worker = new Worker<JobData, JobResult>(

src/runner/models.ts

@@ -1,7 +1,7 @@
 import { ChatModel, createOpenAIClient } from '@dexaai/dexter/model'
 import 'dotenv/config'
 
-import * as config from '../lib/config'
+import * as config from '~/lib/config'
 
 // TODO: support non-OpenAI models
 export const chatModel = new ChatModel({

src/server/assistant-files.ts

@@ -1,8 +1,8 @@
 import { OpenAPIHono } from '@hono/zod-openapi'
 
-import * as routes from './generated/oai-routes'
-import * as utils from './lib/utils'
-import { prisma } from './lib/db'
+import * as routes from '~/generated/oai-routes'
+import * as utils from '~/lib/utils'
+import { prisma } from '~/lib/db'
 
 const app: OpenAPIHono = new OpenAPIHono()
 

src/server/assistants.ts

@@ -1,8 +1,8 @@
 import { OpenAPIHono } from '@hono/zod-openapi'
 
-import * as routes from './generated/oai-routes'
-import * as utils from './lib/utils'
-import { prisma } from './lib/db'
+import * as routes from '~/generated/oai-routes'
+import * as utils from '~/lib/utils'
+import { prisma } from '~/lib/db'
 
 const app: OpenAPIHono = new OpenAPIHono()
 

src/server/files.ts

@@ -3,10 +3,10 @@ import { sha256 } from 'crypto-hash'
 import { fileTypeFromBuffer } from 'file-type'
 import createHttpError from 'http-errors'
 
-import * as routes from './generated/oai-routes'
-import * as storage from './lib/storage'
-import * as utils from './lib/utils'
-import { prisma } from './lib/db'
+import * as routes from '~/generated/oai-routes'
+import * as storage from '~/lib/storage'
+import * as utils from '~/lib/utils'
+import { prisma } from '~/lib/db'
 
 const app: OpenAPIHono = new OpenAPIHono()
 

src/server/index.ts

@@ -5,11 +5,12 @@ import { OpenAPIHono } from '@hono/zod-openapi'
 import 'dotenv/config'
 import { asyncExitHook } from 'exit-hook'
 
+import { prisma } from '~/lib/db'
+import { queue } from '~/lib/queue'
+
 import assistantFiles from './assistant-files'
 import assistants from './assistants'
 import files from './files'
-import { prisma } from './lib/db'
-import { queue } from './lib/queue'
 import messageFiles from './message-files'
 import messages from './messages'
 import runSteps from './run-steps'

src/server/message-files.ts

@@ -1,8 +1,8 @@
 import { OpenAPIHono } from '@hono/zod-openapi'
 
-import * as routes from './generated/oai-routes'
-import * as utils from './lib/utils'
-import { prisma } from './lib/db'
+import * as routes from '~/generated/oai-routes'
+import * as utils from '~/lib/utils'
+import { prisma } from '~/lib/db'
 
 const app: OpenAPIHono = new OpenAPIHono()
 

src/server/messages.ts

@@ -1,9 +1,9 @@
 import { OpenAPIHono } from '@hono/zod-openapi'
 import createError from 'http-errors'
 
-import * as routes from './generated/oai-routes'
-import * as utils from './lib/utils'
-import { prisma } from './lib/db'
+import * as routes from '~/generated/oai-routes'
+import * as utils from '~/lib/utils'
+import { prisma } from '~/lib/db'
 
 const app: OpenAPIHono = new OpenAPIHono()
 

src/server/run-steps.ts

@@ -1,8 +1,8 @@
 import { OpenAPIHono } from '@hono/zod-openapi'
 
-import * as routes from './generated/oai-routes'
-import * as utils from './lib/utils'
-import { prisma } from './lib/db'
+import * as routes from '~/generated/oai-routes'
+import * as utils from '~/lib/utils'
+import { prisma } from '~/lib/db'
 
 const app: OpenAPIHono = new OpenAPIHono()
 

src/server/runs.ts

@@ -2,12 +2,12 @@ import { OpenAPIHono } from '@hono/zod-openapi'
 import { Prisma } from '@prisma/client'
 import createHttpError from 'http-errors'
 
-import * as routes from './generated/oai-routes'
-import * as config from './lib/config'
-import * as utils from './lib/utils'
-import { createThread } from './lib/create-thread'
-import { prisma } from './lib/db'
-import { getJobId, queue } from './lib/queue'
+import * as routes from '~/generated/oai-routes'
+import * as config from '~/lib/config'
+import * as utils from '~/lib/utils'
+import { createThread } from '~/lib/create-thread'
+import { prisma } from '~/lib/db'
+import { getJobId, queue } from '~/lib/queue'
 
 const app: OpenAPIHono = new OpenAPIHono()
 

src/server/threads.ts

@@ -1,9 +1,9 @@
 import { OpenAPIHono } from '@hono/zod-openapi'
 
-import * as routes from './generated/oai-routes'
-import * as utils from './lib/utils'
-import { createThread } from './lib/create-thread'
-import { prisma } from './lib/db'
+import * as routes from '~/generated/oai-routes'
+import * as utils from '~/lib/utils'
+import { createThread } from '~/lib/create-thread'
+import { prisma } from '~/lib/db'
 
 const app: OpenAPIHono = new OpenAPIHono()
 

tsconfig.json

@@ -26,6 +26,9 @@
     "sourceMap": true,
     "noEmit": false,
     "outDir": "dist",
-    "baseUrl": "."
+    "baseUrl": ".",
+    "paths": {
+      "~/*": ["src/*"]
+    }
   }
 }