chore(project): move to dist structure

.github/workflows/ci.yml

@@ -12,22 +12,22 @@ jobs:
     uses: ./.github/workflows/run.yml
     secrets: inherit
     with:
-      cmd: pnpm lint
+      cmd: pnpm build && pnpm lint
 
   generate:
     uses: ./.github/workflows/run.yml
     secrets: inherit
     with:
-      cmd: pnpm generate && git diff --exit-code
+      cmd: pnpm build && pnpm generate && git diff --exit-code
 
   build:
     uses: ./.github/workflows/run.yml
     secrets: inherit
     with:
-      cmd: pnpm run setup && pnpm build && bash .github/start.sh
+      cmd: pnpm build && pnpm run setup && bash .github/start.sh
 
   test:
     uses: ./.github/workflows/run.yml
     secrets: inherit
     with:
-      cmd: pnpm run setup && pnpm test:unit
+      cmd: pnpm build && pnpm run setup && pnpm test:unit

.github/workflows/e2e.yml

@@ -46,6 +46,7 @@ jobs:
       - name: Setup and run e2e shard ${{ matrix.shard }}
         run: |
           set -eux
+          pnpm build
           pnpm run setup
           export DATABASE_URL=postgres://postgres:pw@localhost:5432/test
           E2E_TEST=true pnpm vitest run -c vitest/vitest.e2e.config.mts --no-file-parallelism --shard=${{ matrix.shard }}/5 --reporter=blob --outputFile=e2e-results-${{ matrix.shard }}.blob || true

apps/api/.lintstagedrc.json

@@ -0,0 +1,5 @@
+{
+	"package.json": "pnpm sort-package-json",
+	"**/*.{js,jsx,ts,tsx}": ["pnpm eslint --fix", "pnpm prettier --write"],
+	"**/*.{md,mdx,json,yml,yaml}": ["pnpm prettier --write"]
+}

apps/api/.prettierignore

@@ -0,0 +1,2 @@
+dist
+openapi.json

apps/api/eslint.config.mjs

@@ -0,0 +1,5 @@
+import lint from "../../eslint.config.mjs";
+import noRelativeImportPathsPlugin from "eslint-plugin-no-relative-import-paths";
+
+/** @type {import("eslint").Linter.Config[]} */
+export default [...lint];

apps/api/package.json

@@ -8,9 +8,11 @@
 		"dist/"
 	],
 	"scripts": {
-		"build": "NODE_OPTIONS=\"--max-old-space-size=8192\" tsc && NODE_OPTIONS=\"--max-old-space-size=8192\" tsup && pnpm run generate",
-		"dev": "nodemon -e ts,json --exec 'tsx src/serve.ts'",
-		"generate": "NODE_OPTIONS=\"--max-old-space-size=4096\" tsx ./src/scripts/generate-openapi.ts",
+		"build": "tsc && resolve-tspaths && pnpm run generate",
+		"dev": "concurrently \"tsc-watch --onSuccess 'resolve-tspaths'\" \"nodemon dist/serve.js\"",
+		"format": "eslint --fix . && prettier --write .",
+		"generate": "node ./dist/scripts/generate-openapi.js",
+		"lint": "eslint . && prettier --check .",
 		"start": "node --enable-source-maps dist/serve.js"
 	},
 	"dependencies": {
@@ -21,11 +23,13 @@
 		"@llmgateway/db": "workspace:*",
 		"@llmgateway/instrumentation": "workspace:*",
 		"@llmgateway/logger": "workspace:*",
+		"@llmgateway/models": "workspace:*",
 		"@llmgateway/shared": "workspace:*",
 		"@opentelemetry/api": "1.9.0",
 		"@opentelemetry/sdk-node": "0.205.0",
 		"bcrypt-ts": "7.0.0",
 		"better-auth": "1.2.7",
+		"dotenv": "16.5.0",
 		"drizzle-zod": "0.7.1",
 		"gateway": "workspace:*",
 		"hono": "^4.9.7",

apps/api/src/api.spec.ts

@@ -1,6 +1,6 @@
 import { expect, test } from "vitest";
 
-import { app } from ".";
+import { app } from "./index.js";
 
 test("/", async () => {
 	const res = await app.request("/");

apps/api/src/auth/config.spec.ts

@@ -2,7 +2,7 @@ import { afterEach, beforeEach, describe, expect, test } from "vitest";
 
 import { db, tables } from "@llmgateway/db";
 
-import { apiAuth, redisClient } from "./config";
+import { apiAuth, redisClient } from "./config.js";
 
 describe("API auth configuration", () => {
 	test("should inherit basic auth configuration", () => {

apps/api/src/auth/config.ts

@@ -2,7 +2,7 @@ import { betterAuth } from "better-auth";
 import { drizzleAdapter } from "better-auth/adapters/drizzle";
 import { createAuthMiddleware } from "better-auth/api";
 import { passkey } from "better-auth/plugins/passkey";
-import Redis from "ioredis";
+import { Redis } from "ioredis";
 import nodemailer from "nodemailer";
 
 import { db, eq, tables } from "@llmgateway/db";

apps/api/src/auth/handler.ts

@@ -1,8 +1,8 @@
 import { OpenAPIHono } from "@hono/zod-openapi";
 
-import { apiAuth } from "./config";
+import { apiAuth } from "./config.js";
 
-import type { ServerTypes } from "@/vars";
+import type { ServerTypes } from "@/vars.js";
 
 // Create a Hono app for auth routes
 export const authHandler = new OpenAPIHono<ServerTypes>();

apps/api/src/index.ts

@@ -10,14 +10,14 @@ import { z } from "zod";
 import { db } from "@llmgateway/db";
 import { logger } from "@llmgateway/logger";
 
-import { redisClient } from "./auth/config";
-import { authHandler } from "./auth/handler";
-import { tracingMiddleware } from "./middleware/tracing";
-import { routes } from "./routes";
-import { beacon } from "./routes/beacon";
-import { stripeRoutes } from "./stripe";
+import { redisClient } from "./auth/config.js";
+import { authHandler } from "./auth/handler.js";
+import { tracingMiddleware } from "./middleware/tracing.js";
+import { beacon } from "./routes/beacon.js";
+import { routes } from "./routes/index.js";
+import { stripeRoutes } from "./stripe.js";
 
-import type { ServerTypes } from "./vars";
+import type { ServerTypes } from "./vars.js";
 
 export const config = {
 	servers: [
@@ -148,7 +148,7 @@ app.openapi(root, async (c) => {
 
 	return c.json({
 		message: "OK",
-		version: process.env.APP_VERSION || "v0.0.0-unknown",
+		version: process.env.APP_VERSION || "v0.0.0-55555555",
 		health,
 	});
 });

apps/api/src/lib/maskToken.spec.ts

@@ -1,6 +1,6 @@
 import { describe, expect, it } from "vitest";
 
-import { maskToken } from "./maskToken";
+import { maskToken } from "./maskToken.js";
 
 describe("maskToken", () => {
 	it("masks all characters after the visible ones", () => {

apps/api/src/routes/activity.spec.ts

@@ -1,11 +1,10 @@
 import { afterEach, beforeEach, describe, expect, test } from "vitest";
 
-import { createTestUser, deleteAll } from "@/testing";
+import { app } from "@/index.js";
+import { createTestUser, deleteAll } from "@/testing.js";
 
 import { db, tables } from "@llmgateway/db";
 
-import { app } from "..";
-
 describe("activity endpoint", () => {
 	let token: string;
 	beforeEach(async () => {

apps/api/src/routes/activity.ts

@@ -4,7 +4,7 @@ import { z } from "zod";
 
 import { db } from "@llmgateway/db";
 
-import type { ServerTypes } from "@/vars";
+import type { ServerTypes } from "@/vars.js";
 
 export const activity = new OpenAPIHono<ServerTypes>();
 

apps/api/src/routes/beacon.spec.ts

@@ -1,8 +1,7 @@
 import { describe, expect, it, vi } from "vitest";
 
-import { posthog } from "@/posthog";
-
-import { app } from "..";
+import { app } from "@/index.js";
+import { posthog } from "@/posthog.js";
 
 // Mock PostHog
 vi.mock("@/posthog", () => ({

apps/api/src/routes/beacon.ts

@@ -1,11 +1,11 @@
 import { createRoute, OpenAPIHono } from "@hono/zod-openapi";
 import { z } from "zod";
 
-import { posthog } from "@/posthog";
+import { posthog } from "@/posthog.js";
 
 import { logger } from "@llmgateway/logger";
 
-import type { ServerTypes } from "@/vars";
+import type { ServerTypes } from "@/vars.js";
 
 export const beacon = new OpenAPIHono<ServerTypes>();
 

apps/api/src/routes/chat.ts

@@ -4,7 +4,7 @@ import { z } from "zod";
 
 import { logger } from "@llmgateway/logger";
 
-import type { ServerTypes } from "@/vars";
+import type { ServerTypes } from "@/vars.js";
 
 const chat = new OpenAPIHono<ServerTypes>();
 

apps/api/src/routes/chats.ts

@@ -1,11 +1,11 @@
 import { createRoute, OpenAPIHono, z } from "@hono/zod-openapi";
 import { HTTPException } from "hono/http-exception";
 
-import { hasActiveApiKey } from "@/lib/hasActiveApiKey";
+import { hasActiveApiKey } from "@/lib/hasActiveApiKey.js";
 
 import { db, tables, desc, eq, count, and } from "@llmgateway/db";
 
-import type { ServerTypes } from "@/vars";
+import type { ServerTypes } from "@/vars.js";
 
 const chats = new OpenAPIHono<ServerTypes>();
 

apps/api/src/routes/index.ts

@@ -1,20 +1,20 @@
 import { OpenAPIHono } from "@hono/zod-openapi";
 
-import { apiAuth as auth } from "@/auth/config";
-
-import { activity } from "./activity";
-import { chat } from "./chat";
-import { chats } from "./chats";
-import keysApi from "./keys-api";
-import keysProvider from "./keys-provider";
-import { logs } from "./logs";
-import organization from "./organization";
-import { payments } from "./payments";
-import projects from "./projects";
-import { subscriptions } from "./subscriptions";
-import { user } from "./user";
-
-import type { ServerTypes } from "@/vars";
+import { apiAuth as auth } from "@/auth/config.js";
+
+import { activity } from "./activity.js";
+import { chat } from "./chat.js";
+import { chats } from "./chats.js";
+import keysApi from "./keys-api.js";
+import keysProvider from "./keys-provider.js";
+import { logs } from "./logs.js";
+import organization from "./organization.js";
+import { payments } from "./payments.js";
+import projects from "./projects.js";
+import { subscriptions } from "./subscriptions.js";
+import { user } from "./user.js";
+
+import type { ServerTypes } from "@/vars.js";
 
 export const routes = new OpenAPIHono<ServerTypes>();
 

apps/api/src/routes/keys-api.spec.ts

@@ -1,11 +1,10 @@
 import { expect, test, beforeEach, describe, afterEach } from "vitest";
 
-import { createTestUser, deleteAll } from "@/testing";
+import { app } from "@/index.js";
+import { createTestUser, deleteAll } from "@/testing.js";
 
 import { db, tables } from "@llmgateway/db";
 
-import { app } from "..";
-
 describe("keys route", () => {
 	let token: string;
 

apps/api/src/routes/keys-api.ts

@@ -2,11 +2,11 @@ import { createRoute, OpenAPIHono } from "@hono/zod-openapi";
 import { HTTPException } from "hono/http-exception";
 import { z } from "zod";
 
-import { maskToken } from "@/lib/maskToken";
+import { maskToken } from "@/lib/maskToken.js";
 
 import { eq, db, shortid, tables } from "@llmgateway/db";
 
-import type { ServerTypes } from "@/vars";
+import type { ServerTypes } from "@/vars.js";
 
 export const keysApi = new OpenAPIHono<ServerTypes>();
 

apps/api/src/routes/keys-provider.e2e.ts

@@ -1,14 +1,15 @@
 import "dotenv/config";
 import { afterAll, beforeAll, describe, expect, test } from "vitest";
 
-import { app } from "@/index";
-import { deleteAll } from "@/testing";
+import { app } from "@/index.js";
+import { deleteAll } from "@/testing.js";
 
 import { db, tables } from "@llmgateway/db";
-import { getProviderEnvVar, providers } from "@llmgateway/models";
-
-// eslint-disable-next-line no-relative-import-paths/no-relative-import-paths
-import { getConcurrentTestOptions } from "../../../gateway/src/test-utils/test-helpers";
+import {
+	getConcurrentTestOptions,
+	getProviderEnvVar,
+	providers,
+} from "@llmgateway/models";
 
 // Helper function to generate unique IDs for tests
 function generateTestId(): string {

apps/api/src/routes/keys-provider.spec.ts

@@ -1,11 +1,10 @@
 import { expect, test, beforeEach, describe, afterEach } from "vitest";
 
-import { createTestUser, deleteAll } from "@/testing";
+import { app } from "@/index.js";
+import { createTestUser, deleteAll } from "@/testing.js";
 
 import { db, tables } from "@llmgateway/db";
 
-import { app } from "..";
-
 describe("provider keys route", () => {
 	let token: string;
 

apps/api/src/routes/keys-provider.ts

@@ -2,12 +2,12 @@ import { createRoute, OpenAPIHono } from "@hono/zod-openapi";
 import { HTTPException } from "hono/http-exception";
 import { z } from "zod";
 
-import { maskToken } from "@/lib/maskToken";
+import { maskToken } from "@/lib/maskToken.js";
 
 import { db, eq, tables } from "@llmgateway/db";
 import { providers, validateProviderKey } from "@llmgateway/models";
 
-import type { ServerTypes } from "@/vars";
+import type { ServerTypes } from "@/vars.js";
 import type { ProviderId } from "@llmgateway/models";
 
 export const keysProvider = new OpenAPIHono<ServerTypes>();

apps/api/src/routes/logs.spec.ts

@@ -1,11 +1,10 @@
 import { afterEach, beforeEach, describe, expect, test } from "vitest";
 
-import { createTestUser, deleteAll } from "@/testing";
+import { app } from "@/index.js";
+import { createTestUser, deleteAll } from "@/testing.js";
 
 import { db, tables } from "@llmgateway/db";
 
-import { app } from "..";
-
 describe("logs route", () => {
 	let token: string;
 

apps/api/src/routes/logs.ts

@@ -22,7 +22,7 @@ import {
 	tools,
 } from "@llmgateway/db";
 
-import type { ServerTypes } from "@/vars";
+import type { ServerTypes } from "@/vars.js";
 
 export const logs = new OpenAPIHono<ServerTypes>();
 

apps/api/src/routes/organization.ts

@@ -4,7 +4,7 @@ import { z } from "zod";
 
 import { db, eq, tables } from "@llmgateway/db";
 
-import type { ServerTypes } from "@/vars";
+import type { ServerTypes } from "@/vars.js";
 
 export const organization = new OpenAPIHono<ServerTypes>();