From 4a70b47650ff74556a556e04a51591725f66113c Mon Sep 17 00:00:00 2001
From: seveibar <seveibar@gmail.com>
Date: Fri, 9 Aug 2024 17:57:56 -0700
Subject: [PATCH] checkpoint, fixing type errors, rename api directory

---
 {dev-server-api => api}/.gitignore                     |  0
 {dev-server-api => api}/README.md                      |  0
 {dev-server-api/src => api}/db/generic-json-level.ts   |  0
 {dev-server-api/src => api}/db/get-db.ts               |  0
 {dev-server-api/src => api}/db/schema.ts               |  0
 {dev-server-api/src => api}/db/zod-level-db.ts         |  0
 {dev-server-api => api}/index.ts                       |  0
 {dev-server-api/src => api/lib}/middlewares/with-db.ts |  0
 .../lib}/middlewares/with-debug-request-logging.ts     |  0
 .../src => api/lib}/middlewares/with-error-response.ts |  0
 {dev-server-api/src => api/lib}/with-winter-spec.ts    |  0
 .../src => api}/lib/zod/export_parameters.ts           |  0
 {dev-server-api => api}/routes/api/db/download.ts      |  3 +--
 .../routes/api/dev_package_examples/create.ts          |  3 +--
 .../routes/api/dev_package_examples/get.ts             |  5 ++---
 .../routes/api/dev_package_examples/list.ts            |  3 +--
 .../routes/api/dev_package_examples/update.ts          |  7 +++----
 {dev-server-api => api}/routes/api/dev_server/reset.ts |  3 +--
 .../routes/api/export_files/create.ts                  |  4 ++--
 .../routes/api/export_files/download.ts                |  2 +-
 .../routes/api/export_requests/create.ts               |  7 +++----
 .../routes/api/export_requests/get.ts                  |  9 +++------
 .../routes/api/export_requests/list.ts                 |  5 ++---
 .../routes/api/export_requests/update.ts               |  3 +--
 {dev-server-api/routes => api/routes/api}/health.ts    |  3 +--
 .../routes/api/package_info/create.ts                  |  3 +--
 {dev-server-api => api}/routes/api/package_info/get.ts |  6 +++---
 {dev-server-api/routes/api => api/routes}/health.ts    |  3 +--
 {dev-server-api => api}/routes/index.ts                |  3 +--
 {dev-server-api => api}/server.ts                      |  0
 {dev-server-api => api}/static-routes.ts               |  0
 .../tests/fixtures/get-test-server.ts                  |  0
 {dev-server-api => api}/tests/fixtures/start-server.ts |  0
 .../tests/routes/dev_package_examples/create.test.ts   |  0
 .../tests/routes/dev_package_examples/get.test.ts      |  0
 .../tests/routes/dev_package_examples/list.test.ts     |  0
 .../tests/routes/dev_package_examples/update.test.ts   |  0
 .../tests/routes/export_files/create.test.ts           |  0
 .../tests/routes/export_files/download.test.ts         |  0
 .../tests/routes/export_requests/create.test.ts        |  0
 .../tests/routes/export_requests/get.test.ts           |  0
 .../tests/routes/export_requests/list.test.ts          |  0
 .../tests/routes/export_requests/update.test.ts        |  0
 {dev-server-api => api}/tests/routes/health.test.ts    |  0
 biome.json                                             |  1 -
 .../src/components/dialogs/generic-export-dialog.tsx   |  6 +-----
 lib/cmd-fns/dev/dev-server-request-handler.ts          |  2 +-
 package.json                                           |  2 +-
 tsconfig.json                                          | 10 ----------
 49 files changed, 31 insertions(+), 62 deletions(-)
 rename {dev-server-api => api}/.gitignore (100%)
 rename {dev-server-api => api}/README.md (100%)
 rename {dev-server-api/src => api}/db/generic-json-level.ts (100%)
 rename {dev-server-api/src => api}/db/get-db.ts (100%)
 rename {dev-server-api/src => api}/db/schema.ts (100%)
 rename {dev-server-api/src => api}/db/zod-level-db.ts (100%)
 rename {dev-server-api => api}/index.ts (100%)
 rename {dev-server-api/src => api/lib}/middlewares/with-db.ts (100%)
 rename {dev-server-api/src => api/lib}/middlewares/with-debug-request-logging.ts (100%)
 rename {dev-server-api/src => api/lib}/middlewares/with-error-response.ts (100%)
 rename {dev-server-api/src => api/lib}/with-winter-spec.ts (100%)
 rename {dev-server-api/src => api}/lib/zod/export_parameters.ts (100%)
 rename {dev-server-api => api}/routes/api/db/download.ts (85%)
 rename {dev-server-api => api}/routes/api/dev_package_examples/create.ts (94%)
 rename {dev-server-api => api}/routes/api/dev_package_examples/get.ts (90%)
 rename {dev-server-api => api}/routes/api/dev_package_examples/list.ts (93%)
 rename {dev-server-api => api}/routes/api/dev_package_examples/update.ts (90%)
 rename {dev-server-api => api}/routes/api/dev_server/reset.ts (76%)
 rename {dev-server-api => api}/routes/api/export_files/create.ts (83%)
 rename {dev-server-api => api}/routes/api/export_files/download.ts (91%)
 rename {dev-server-api => api}/routes/api/export_requests/create.ts (77%)
 rename {dev-server-api => api}/routes/api/export_requests/get.ts (80%)
 rename {dev-server-api => api}/routes/api/export_requests/list.ts (82%)
 rename {dev-server-api => api}/routes/api/export_requests/update.ts (92%)
 rename {dev-server-api/routes => api/routes/api}/health.ts (73%)
 rename {dev-server-api => api}/routes/api/package_info/create.ts (86%)
 rename {dev-server-api => api}/routes/api/package_info/get.ts (70%)
 rename {dev-server-api/routes/api => api/routes}/health.ts (72%)
 rename {dev-server-api => api}/routes/index.ts (82%)
 rename {dev-server-api => api}/server.ts (100%)
 rename {dev-server-api => api}/static-routes.ts (100%)
 rename {dev-server-api => api}/tests/fixtures/get-test-server.ts (100%)
 rename {dev-server-api => api}/tests/fixtures/start-server.ts (100%)
 rename {dev-server-api => api}/tests/routes/dev_package_examples/create.test.ts (100%)
 rename {dev-server-api => api}/tests/routes/dev_package_examples/get.test.ts (100%)
 rename {dev-server-api => api}/tests/routes/dev_package_examples/list.test.ts (100%)
 rename {dev-server-api => api}/tests/routes/dev_package_examples/update.test.ts (100%)
 rename {dev-server-api => api}/tests/routes/export_files/create.test.ts (100%)
 rename {dev-server-api => api}/tests/routes/export_files/download.test.ts (100%)
 rename {dev-server-api => api}/tests/routes/export_requests/create.test.ts (100%)
 rename {dev-server-api => api}/tests/routes/export_requests/get.test.ts (100%)
 rename {dev-server-api => api}/tests/routes/export_requests/list.test.ts (100%)
 rename {dev-server-api => api}/tests/routes/export_requests/update.test.ts (100%)
 rename {dev-server-api => api}/tests/routes/health.test.ts (100%)

diff --git a/dev-server-api/.gitignore b/api/.gitignore
similarity index 100%
rename from dev-server-api/.gitignore
rename to api/.gitignore
diff --git a/dev-server-api/README.md b/api/README.md
similarity index 100%
rename from dev-server-api/README.md
rename to api/README.md
diff --git a/dev-server-api/src/db/generic-json-level.ts b/api/db/generic-json-level.ts
similarity index 100%
rename from dev-server-api/src/db/generic-json-level.ts
rename to api/db/generic-json-level.ts
diff --git a/dev-server-api/src/db/get-db.ts b/api/db/get-db.ts
similarity index 100%
rename from dev-server-api/src/db/get-db.ts
rename to api/db/get-db.ts
diff --git a/dev-server-api/src/db/schema.ts b/api/db/schema.ts
similarity index 100%
rename from dev-server-api/src/db/schema.ts
rename to api/db/schema.ts
diff --git a/dev-server-api/src/db/zod-level-db.ts b/api/db/zod-level-db.ts
similarity index 100%
rename from dev-server-api/src/db/zod-level-db.ts
rename to api/db/zod-level-db.ts
diff --git a/dev-server-api/index.ts b/api/index.ts
similarity index 100%
rename from dev-server-api/index.ts
rename to api/index.ts
diff --git a/dev-server-api/src/middlewares/with-db.ts b/api/lib/middlewares/with-db.ts
similarity index 100%
rename from dev-server-api/src/middlewares/with-db.ts
rename to api/lib/middlewares/with-db.ts
diff --git a/dev-server-api/src/middlewares/with-debug-request-logging.ts b/api/lib/middlewares/with-debug-request-logging.ts
similarity index 100%
rename from dev-server-api/src/middlewares/with-debug-request-logging.ts
rename to api/lib/middlewares/with-debug-request-logging.ts
diff --git a/dev-server-api/src/middlewares/with-error-response.ts b/api/lib/middlewares/with-error-response.ts
similarity index 100%
rename from dev-server-api/src/middlewares/with-error-response.ts
rename to api/lib/middlewares/with-error-response.ts
diff --git a/dev-server-api/src/with-winter-spec.ts b/api/lib/with-winter-spec.ts
similarity index 100%
rename from dev-server-api/src/with-winter-spec.ts
rename to api/lib/with-winter-spec.ts
diff --git a/dev-server-api/src/lib/zod/export_parameters.ts b/api/lib/zod/export_parameters.ts
similarity index 100%
rename from dev-server-api/src/lib/zod/export_parameters.ts
rename to api/lib/zod/export_parameters.ts
diff --git a/dev-server-api/routes/api/db/download.ts b/api/routes/api/db/download.ts
similarity index 85%
rename from dev-server-api/routes/api/db/download.ts
rename to api/routes/api/db/download.ts
index b2a85465..8cefef3d 100644
--- a/dev-server-api/routes/api/db/download.ts
+++ b/api/routes/api/db/download.ts
@@ -1,5 +1,4 @@
-// @ts-nocheck
-import { withWinterSpec } from "@server/with-winter-spec"
+import { withWinterSpec } from "api/lib/with-winter-spec"
 import { z } from "zod"
 
 export default withWinterSpec({
diff --git a/dev-server-api/routes/api/dev_package_examples/create.ts b/api/routes/api/dev_package_examples/create.ts
similarity index 94%
rename from dev-server-api/routes/api/dev_package_examples/create.ts
rename to api/routes/api/dev_package_examples/create.ts
index e0ea2937..be648458 100644
--- a/dev-server-api/routes/api/dev_package_examples/create.ts
+++ b/api/routes/api/dev_package_examples/create.ts
@@ -1,5 +1,4 @@
-// @ts-nocheck
-import { withWinterSpec } from "@server/with-winter-spec"
+import { withWinterSpec } from "api/lib/with-winter-spec"
 import { z } from "zod"
 
 export default withWinterSpec({
diff --git a/dev-server-api/routes/api/dev_package_examples/get.ts b/api/routes/api/dev_package_examples/get.ts
similarity index 90%
rename from dev-server-api/routes/api/dev_package_examples/get.ts
rename to api/routes/api/dev_package_examples/get.ts
index 3060b546..c88154d1 100644
--- a/dev-server-api/routes/api/dev_package_examples/get.ts
+++ b/api/routes/api/dev_package_examples/get.ts
@@ -1,6 +1,5 @@
-// @ts-nocheck
-import { withWinterSpec } from "@server/with-winter-spec"
-import { NotFoundError } from "edgespec/middleware"
+import { withWinterSpec } from "api/lib/with-winter-spec"
+import { NotFoundError } from "winterspec/middleware"
 import { z } from "zod"
 
 export default withWinterSpec({
diff --git a/dev-server-api/routes/api/dev_package_examples/list.ts b/api/routes/api/dev_package_examples/list.ts
similarity index 93%
rename from dev-server-api/routes/api/dev_package_examples/list.ts
rename to api/routes/api/dev_package_examples/list.ts
index 12d7eb68..2a7e706b 100644
--- a/dev-server-api/routes/api/dev_package_examples/list.ts
+++ b/api/routes/api/dev_package_examples/list.ts
@@ -1,5 +1,4 @@
-// @ts-nocheck
-import { withWinterSpec } from "@server/with-winter-spec"
+import { withWinterSpec } from "api/lib/with-winter-spec"
 import { z } from "zod"
 
 export default withWinterSpec({
diff --git a/dev-server-api/routes/api/dev_package_examples/update.ts b/api/routes/api/dev_package_examples/update.ts
similarity index 90%
rename from dev-server-api/routes/api/dev_package_examples/update.ts
rename to api/routes/api/dev_package_examples/update.ts
index 9aba40ce..2e170636 100644
--- a/dev-server-api/routes/api/dev_package_examples/update.ts
+++ b/api/routes/api/dev_package_examples/update.ts
@@ -1,8 +1,7 @@
-// @ts-nocheck
-import { withWinterSpec } from "@server/with-winter-spec"
-import { NotFoundError } from "edgespec/middleware"
+import { withWinterSpec } from "api/lib/with-winter-spec"
+import { NotFoundError } from "winterspec/middleware"
 import { z } from "zod"
-import { DevPackageExampleSchema } from "@server/db/schema"
+import { DevPackageExampleSchema } from "api/db/schema"
 
 export default withWinterSpec({
   methods: ["POST"],
diff --git a/dev-server-api/routes/api/dev_server/reset.ts b/api/routes/api/dev_server/reset.ts
similarity index 76%
rename from dev-server-api/routes/api/dev_server/reset.ts
rename to api/routes/api/dev_server/reset.ts
index a64b084e..7e09575f 100644
--- a/dev-server-api/routes/api/dev_server/reset.ts
+++ b/api/routes/api/dev_server/reset.ts
@@ -1,5 +1,4 @@
-// @ts-nocheck
-import { withWinterSpec } from "@server/with-winter-spec"
+import { withWinterSpec } from "api/lib/with-winter-spec"
 
 export default withWinterSpec({
   methods: ["GET", "POST"],
diff --git a/dev-server-api/routes/api/export_files/create.ts b/api/routes/api/export_files/create.ts
similarity index 83%
rename from dev-server-api/routes/api/export_files/create.ts
rename to api/routes/api/export_files/create.ts
index db8eb3be..b99180a8 100644
--- a/dev-server-api/routes/api/export_files/create.ts
+++ b/api/routes/api/export_files/create.ts
@@ -1,5 +1,5 @@
-import { ExportFileSchema } from "dev-server-api/src/db/schema"
-import { withWinterSpec } from "dev-server-api/src/with-winter-spec"
+import { ExportFileSchema } from "api/src/db/schema"
+import { withWinterSpec } from "api/lib/with-winter-spec"
 import { z } from "zod"
 
 export default withWinterSpec({
diff --git a/dev-server-api/routes/api/export_files/download.ts b/api/routes/api/export_files/download.ts
similarity index 91%
rename from dev-server-api/routes/api/export_files/download.ts
rename to api/routes/api/export_files/download.ts
index c2779573..9f8c89a8 100644
--- a/dev-server-api/routes/api/export_files/download.ts
+++ b/api/routes/api/export_files/download.ts
@@ -1,5 +1,5 @@
 import { export_file } from "src/lib/zod/export_file"
-import { withWinterSpec } from "../../../src/with-winter-spec"
+import { withWinterSpec } from "api/lib/with-winter-spec"
 import { NotFoundError } from "winterspec/middleware"
 import { z } from "zod"
 
diff --git a/dev-server-api/routes/api/export_requests/create.ts b/api/routes/api/export_requests/create.ts
similarity index 77%
rename from dev-server-api/routes/api/export_requests/create.ts
rename to api/routes/api/export_requests/create.ts
index beafa0f0..b2982f0e 100644
--- a/dev-server-api/routes/api/export_requests/create.ts
+++ b/api/routes/api/export_requests/create.ts
@@ -1,8 +1,7 @@
-// @ts-nocheck
-import { withWinterSpec } from "@server/with-winter-spec"
+import { withWinterSpec } from "api/lib/with-winter-spec"
 import { z } from "zod"
-import { export_parameters } from "../../../src/lib/zod/export_parameters"
-import { ExportRequestSchema } from "@server/db/schema"
+import { export_parameters } from "api/lib/zod/export_parameters"
+import { ExportRequestSchema } from "api/db/schema"
 
 export default withWinterSpec({
   methods: ["POST"],
diff --git a/dev-server-api/routes/api/export_requests/get.ts b/api/routes/api/export_requests/get.ts
similarity index 80%
rename from dev-server-api/routes/api/export_requests/get.ts
rename to api/routes/api/export_requests/get.ts
index 8c77c5cc..02992653 100644
--- a/dev-server-api/routes/api/export_requests/get.ts
+++ b/api/routes/api/export_requests/get.ts
@@ -1,10 +1,7 @@
-// @ts-nocheck
-import { withWinterSpec } from "@server/with-winter-spec"
+import { withWinterSpec } from "api/lib/with-winter-spec"
 import { z } from "zod"
-import { export_request } from "src/lib/zod/export_request"
-import { NotFoundError } from "edgespec/middleware"
-import { ExportRequestSchema } from "@server/db/schema"
-import { file } from "bun"
+import { NotFoundError } from "winterspec/middleware"
+import { ExportRequestSchema } from "api/db/schema"
 
 export default withWinterSpec({
   methods: ["GET", "POST"],
diff --git a/dev-server-api/routes/api/export_requests/list.ts b/api/routes/api/export_requests/list.ts
similarity index 82%
rename from dev-server-api/routes/api/export_requests/list.ts
rename to api/routes/api/export_requests/list.ts
index 3ad2b82d..5146d6ea 100644
--- a/dev-server-api/routes/api/export_requests/list.ts
+++ b/api/routes/api/export_requests/list.ts
@@ -1,7 +1,6 @@
-// @ts-nocheck
-import { withWinterSpec } from "../../../src/with-winter-spec"
+import { withWinterSpec } from "api/lib/with-winter-spec"
 import { z } from "zod"
-import { ExportRequestSchema } from "@server/db/schema"
+import { ExportRequestSchema } from "api/db/schema"
 
 export default withWinterSpec({
   methods: ["GET", "POST"],
diff --git a/dev-server-api/routes/api/export_requests/update.ts b/api/routes/api/export_requests/update.ts
similarity index 92%
rename from dev-server-api/routes/api/export_requests/update.ts
rename to api/routes/api/export_requests/update.ts
index cf88b548..6a1212eb 100644
--- a/dev-server-api/routes/api/export_requests/update.ts
+++ b/api/routes/api/export_requests/update.ts
@@ -1,5 +1,4 @@
-// @ts-nocheck
-import { withWinterSpec } from "@server/with-winter-spec"
+import { withWinterSpec } from "api/lib/with-winter-spec"
 import { NotFoundError } from "winterspec/middleware"
 import { z } from "zod"
 import { export_request } from "@api/src/lib/zod/export_request"
diff --git a/dev-server-api/routes/health.ts b/api/routes/api/health.ts
similarity index 73%
rename from dev-server-api/routes/health.ts
rename to api/routes/api/health.ts
index bd8bec15..f9efb010 100644
--- a/dev-server-api/routes/health.ts
+++ b/api/routes/api/health.ts
@@ -1,5 +1,4 @@
-// @ts-nocheck
-import { withWinterSpec } from "../src/with-winter-spec"
+import { withWinterSpec } from "api/lib/with-winter-spec"
 import { z } from "zod"
 
 export default withWinterSpec({
diff --git a/dev-server-api/routes/api/package_info/create.ts b/api/routes/api/package_info/create.ts
similarity index 86%
rename from dev-server-api/routes/api/package_info/create.ts
rename to api/routes/api/package_info/create.ts
index 1b838a7f..1bd703c9 100644
--- a/dev-server-api/routes/api/package_info/create.ts
+++ b/api/routes/api/package_info/create.ts
@@ -1,5 +1,4 @@
-// @ts-nocheck
-import { withWinterSpec } from "@server/with-winter-spec"
+import { withWinterSpec } from "api/lib/with-winter-spec"
 import { z } from "zod"
 
 export default withWinterSpec({
diff --git a/dev-server-api/routes/api/package_info/get.ts b/api/routes/api/package_info/get.ts
similarity index 70%
rename from dev-server-api/routes/api/package_info/get.ts
rename to api/routes/api/package_info/get.ts
index 06af2ab3..82ab361a 100644
--- a/dev-server-api/routes/api/package_info/get.ts
+++ b/api/routes/api/package_info/get.ts
@@ -1,6 +1,6 @@
-import { PackageInfoSchema } from "@server/db/schema"
-// @ts-nocheck
-import { withWinterSpec } from "@server/with-winter-spec"
+import { PackageInfoSchema } from "api/db/schema"
+
+import { withWinterSpec } from "api/lib/with-winter-spec"
 import { z } from "zod"
 
 export default withWinterSpec({
diff --git a/dev-server-api/routes/api/health.ts b/api/routes/health.ts
similarity index 72%
rename from dev-server-api/routes/api/health.ts
rename to api/routes/health.ts
index 35251f9f..f9efb010 100644
--- a/dev-server-api/routes/api/health.ts
+++ b/api/routes/health.ts
@@ -1,5 +1,4 @@
-// @ts-nocheck
-import { withWinterSpec } from "../../src/with-winter-spec"
+import { withWinterSpec } from "api/lib/with-winter-spec"
 import { z } from "zod"
 
 export default withWinterSpec({
diff --git a/dev-server-api/routes/index.ts b/api/routes/index.ts
similarity index 82%
rename from dev-server-api/routes/index.ts
rename to api/routes/index.ts
index b3da50a5..dcef72e0 100644
--- a/dev-server-api/routes/index.ts
+++ b/api/routes/index.ts
@@ -1,5 +1,4 @@
-// @ts-nocheck
-import { withWinterSpec } from "../src/with-winter-spec"
+import { withWinterSpec } from "api/lib/with-winter-spec"
 import { z } from "zod"
 
 export default withWinterSpec({
diff --git a/dev-server-api/server.ts b/api/server.ts
similarity index 100%
rename from dev-server-api/server.ts
rename to api/server.ts
diff --git a/dev-server-api/static-routes.ts b/api/static-routes.ts
similarity index 100%
rename from dev-server-api/static-routes.ts
rename to api/static-routes.ts
diff --git a/dev-server-api/tests/fixtures/get-test-server.ts b/api/tests/fixtures/get-test-server.ts
similarity index 100%
rename from dev-server-api/tests/fixtures/get-test-server.ts
rename to api/tests/fixtures/get-test-server.ts
diff --git a/dev-server-api/tests/fixtures/start-server.ts b/api/tests/fixtures/start-server.ts
similarity index 100%
rename from dev-server-api/tests/fixtures/start-server.ts
rename to api/tests/fixtures/start-server.ts
diff --git a/dev-server-api/tests/routes/dev_package_examples/create.test.ts b/api/tests/routes/dev_package_examples/create.test.ts
similarity index 100%
rename from dev-server-api/tests/routes/dev_package_examples/create.test.ts
rename to api/tests/routes/dev_package_examples/create.test.ts
diff --git a/dev-server-api/tests/routes/dev_package_examples/get.test.ts b/api/tests/routes/dev_package_examples/get.test.ts
similarity index 100%
rename from dev-server-api/tests/routes/dev_package_examples/get.test.ts
rename to api/tests/routes/dev_package_examples/get.test.ts
diff --git a/dev-server-api/tests/routes/dev_package_examples/list.test.ts b/api/tests/routes/dev_package_examples/list.test.ts
similarity index 100%
rename from dev-server-api/tests/routes/dev_package_examples/list.test.ts
rename to api/tests/routes/dev_package_examples/list.test.ts
diff --git a/dev-server-api/tests/routes/dev_package_examples/update.test.ts b/api/tests/routes/dev_package_examples/update.test.ts
similarity index 100%
rename from dev-server-api/tests/routes/dev_package_examples/update.test.ts
rename to api/tests/routes/dev_package_examples/update.test.ts
diff --git a/dev-server-api/tests/routes/export_files/create.test.ts b/api/tests/routes/export_files/create.test.ts
similarity index 100%
rename from dev-server-api/tests/routes/export_files/create.test.ts
rename to api/tests/routes/export_files/create.test.ts
diff --git a/dev-server-api/tests/routes/export_files/download.test.ts b/api/tests/routes/export_files/download.test.ts
similarity index 100%
rename from dev-server-api/tests/routes/export_files/download.test.ts
rename to api/tests/routes/export_files/download.test.ts
diff --git a/dev-server-api/tests/routes/export_requests/create.test.ts b/api/tests/routes/export_requests/create.test.ts
similarity index 100%
rename from dev-server-api/tests/routes/export_requests/create.test.ts
rename to api/tests/routes/export_requests/create.test.ts
diff --git a/dev-server-api/tests/routes/export_requests/get.test.ts b/api/tests/routes/export_requests/get.test.ts
similarity index 100%
rename from dev-server-api/tests/routes/export_requests/get.test.ts
rename to api/tests/routes/export_requests/get.test.ts
diff --git a/dev-server-api/tests/routes/export_requests/list.test.ts b/api/tests/routes/export_requests/list.test.ts
similarity index 100%
rename from dev-server-api/tests/routes/export_requests/list.test.ts
rename to api/tests/routes/export_requests/list.test.ts
diff --git a/dev-server-api/tests/routes/export_requests/update.test.ts b/api/tests/routes/export_requests/update.test.ts
similarity index 100%
rename from dev-server-api/tests/routes/export_requests/update.test.ts
rename to api/tests/routes/export_requests/update.test.ts
diff --git a/dev-server-api/tests/routes/health.test.ts b/api/tests/routes/health.test.ts
similarity index 100%
rename from dev-server-api/tests/routes/health.test.ts
rename to api/tests/routes/health.test.ts
diff --git a/biome.json b/biome.json
index ec1121fd..e98f7d23 100644
--- a/biome.json
+++ b/biome.json
@@ -24,7 +24,6 @@
   "linter": {
     "enabled": true,
     "rules": {
-      "recommended": true,
       "suspicious": {
         "noExplicitAny": "off"
       },
diff --git a/dev-server-frontend/src/components/dialogs/generic-export-dialog.tsx b/dev-server-frontend/src/components/dialogs/generic-export-dialog.tsx
index d4493963..4ccc4ba9 100644
--- a/dev-server-frontend/src/components/dialogs/generic-export-dialog.tsx
+++ b/dev-server-frontend/src/components/dialogs/generic-export-dialog.tsx
@@ -4,11 +4,7 @@ import { useGlobalStore } from "src/hooks/use-global-store"
 import { useActiveDevPackageExampleLite } from "src/hooks/use-active-dev-package-example-lite"
 import { Button } from "../ui/button"
 import axios from "axios"
-import {
-  ExportParameters,
-  ExportParametersInput,
-  export_parameters,
-} from "@server/lib/zod/export_parameters"
+import type { ExportParametersInput } from "api/lib/zod/export_parameters"
 
 export const useGenericExportDialog = ({
   exportFileName,
diff --git a/lib/cmd-fns/dev/dev-server-request-handler.ts b/lib/cmd-fns/dev/dev-server-request-handler.ts
index f92a9eea..c7787143 100644
--- a/lib/cmd-fns/dev/dev-server-request-handler.ts
+++ b/lib/cmd-fns/dev/dev-server-request-handler.ts
@@ -1,4 +1,4 @@
-import apiServer from "../../../dev-server-api"
+import apiServer from "../../../api"
 import frontendVfs from "../../../dev-server-frontend/dist/bundle"
 import EdgeRuntimePrimitives from "@edge-runtime/primitives"
 import mime from "mime-types"
diff --git a/package.json b/package.json
index d2c8e753..1b00f7aa 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
     "dev:test-project": "bun --hot cli.ts dev --cwd ./example-project",
     "start:dev-server": "bun build:dev-server && bun cli.ts dev -y --cwd ./example-project",
     "build:dev-server": "bun run build:dev-server:api && bun run build:dev-server:frontend",
-    "build:dev-server:api": "cd dev-server-api && winterspec bundle-routes -i ./routes -o ./static-routes.ts",
+    "build:dev-server:api": "cd api && winterspec bundle-routes -i ./routes -o ./static-routes.ts",
     "build:dev-server:frontend": "vite build --config dev-server-frontend/vite.config.ts && make-vfs --content-format string --dir dev-server-frontend/dist --outfile ./dev-server-frontend/dist/bundle.ts",
     "build:cli": "bun build-cli.ts",
     "build": "bun build:dev-server && npm run build:cli",
diff --git a/tsconfig.json b/tsconfig.json
index c1742945..8cd0b7a0 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -29,13 +29,6 @@
     // "rootDir": "./",                                  /* Specify the root folder within your source files. */
     "moduleResolution": "Bundler" /* Specify how TypeScript looks up a file from a given module specifier. */,
     "baseUrl": "./" /* Specify the base directory to resolve non-relative module names. */,
-    "paths": {
-      "@api/*": ["./dev-server-api/*"],
-      "@cli/*": ["./cli/*"],
-      "@frontend/*": ["./dev-server-frontend/*"],
-      // deprecated: use @api/* instead
-      "@server/*": ["./dev-server-api/src/*"],
-    } /* Specify a set of entries that re-map imports to additional lookup locations. */,
     // "rootDirs": [],                                   /* Allow multiple folders to be treated as one when resolving modules. */
     // "typeRoots": [],                                  /* Specify multiple folders that act like './node_modules/@types'. */
     // "types": [],                                      /* Specify type package names to be included without being referenced in a source file. */
@@ -126,7 +119,4 @@
   //   "dist",
   //   "**/dist"
   // ]
-  "exclude": [
-    "**/routes/**/*.ts"
-  ]
 }