checkpoint, fixing type errors, rename api directory

tscircuit · Aug 10, 2024 · 4a70b47 · 4a70b47
1 parent b8afe85
commit 4a70b47
Show file tree

Hide file tree

Showing 49 changed files with 31 additions and 62 deletions.
diff --git a/dev-server-api/.gitignore → api/.gitignore b/dev-server-api/.gitignore → api/.gitignore
diff --git a/dev-server-api/README.md → api/README.md b/dev-server-api/README.md → api/README.md
diff --git a/dev-server-api/src/db/generic-json-level.ts → api/db/generic-json-level.ts b/dev-server-api/src/db/generic-json-level.ts → api/db/generic-json-level.ts
diff --git a/dev-server-api/src/db/get-db.ts → api/db/get-db.ts b/dev-server-api/src/db/get-db.ts → api/db/get-db.ts
diff --git a/dev-server-api/src/db/schema.ts → api/db/schema.ts b/dev-server-api/src/db/schema.ts → api/db/schema.ts
diff --git a/dev-server-api/src/db/zod-level-db.ts → api/db/zod-level-db.ts b/dev-server-api/src/db/zod-level-db.ts → api/db/zod-level-db.ts
diff --git a/dev-server-api/index.ts → api/index.ts b/dev-server-api/index.ts → api/index.ts
diff --git a/dev-server-api/src/middlewares/with-db.ts → api/lib/middlewares/with-db.ts b/dev-server-api/src/middlewares/with-db.ts → api/lib/middlewares/with-db.ts
diff --git a/...middlewares/with-debug-request-logging.ts → ...middlewares/with-debug-request-logging.ts b/...middlewares/with-debug-request-logging.ts → ...middlewares/with-debug-request-logging.ts
diff --git a/...pi/src/middlewares/with-error-response.ts → api/lib/middlewares/with-error-response.ts b/...pi/src/middlewares/with-error-response.ts → api/lib/middlewares/with-error-response.ts
diff --git a/dev-server-api/src/with-winter-spec.ts → api/lib/with-winter-spec.ts b/dev-server-api/src/with-winter-spec.ts → api/lib/with-winter-spec.ts
diff --git a/...rver-api/src/lib/zod/export_parameters.ts → api/lib/zod/export_parameters.ts b/...rver-api/src/lib/zod/export_parameters.ts → api/lib/zod/export_parameters.ts
diff --git a/dev-server-api/routes/api/db/download.ts → api/routes/api/db/download.ts b/dev-server-api/routes/api/db/download.ts → 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/...routes/api/dev_package_examples/create.ts → ...routes/api/dev_package_examples/create.ts b/...routes/api/dev_package_examples/create.ts → ...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/...pi/routes/api/dev_package_examples/get.ts → api/routes/api/dev_package_examples/get.ts b/...pi/routes/api/dev_package_examples/get.ts → 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/...i/routes/api/dev_package_examples/list.ts → api/routes/api/dev_package_examples/list.ts b/...i/routes/api/dev_package_examples/list.ts → 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/...routes/api/dev_package_examples/update.ts → ...routes/api/dev_package_examples/update.ts b/...routes/api/dev_package_examples/update.ts → ...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/...server-api/routes/api/dev_server/reset.ts → api/routes/api/dev_server/reset.ts b/...server-api/routes/api/dev_server/reset.ts → 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/...ver-api/routes/api/export_files/create.ts → api/routes/api/export_files/create.ts b/...ver-api/routes/api/export_files/create.ts → 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/...r-api/routes/api/export_files/download.ts → api/routes/api/export_files/download.ts b/...r-api/routes/api/export_files/download.ts → 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/...-api/routes/api/export_requests/create.ts → api/routes/api/export_requests/create.ts b/...-api/routes/api/export_requests/create.ts → 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/...ver-api/routes/api/export_requests/get.ts → api/routes/api/export_requests/get.ts b/...ver-api/routes/api/export_requests/get.ts → 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/...er-api/routes/api/export_requests/list.ts → api/routes/api/export_requests/list.ts b/...er-api/routes/api/export_requests/list.ts → 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/...-api/routes/api/export_requests/update.ts → api/routes/api/export_requests/update.ts b/...-api/routes/api/export_requests/update.ts → 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 → api/routes/api/health.ts b/dev-server-api/routes/health.ts → 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/...ver-api/routes/api/package_info/create.ts → api/routes/api/package_info/create.ts b/...ver-api/routes/api/package_info/create.ts → 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/...server-api/routes/api/package_info/get.ts → api/routes/api/package_info/get.ts b/...server-api/routes/api/package_info/get.ts → 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 → api/routes/health.ts b/dev-server-api/routes/api/health.ts → 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 → api/routes/index.ts b/dev-server-api/routes/index.ts → 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 → api/server.ts b/dev-server-api/server.ts → api/server.ts
diff --git a/dev-server-api/static-routes.ts → api/static-routes.ts b/dev-server-api/static-routes.ts → api/static-routes.ts
diff --git a/...ver-api/tests/fixtures/get-test-server.ts → api/tests/fixtures/get-test-server.ts b/...ver-api/tests/fixtures/get-test-server.ts → api/tests/fixtures/get-test-server.ts
diff --git a/...server-api/tests/fixtures/start-server.ts → api/tests/fixtures/start-server.ts b/...server-api/tests/fixtures/start-server.ts → api/tests/fixtures/start-server.ts
diff --git a/...outes/dev_package_examples/create.test.ts → ...outes/dev_package_examples/create.test.ts b/...outes/dev_package_examples/create.test.ts → ...outes/dev_package_examples/create.test.ts
diff --git a/...s/routes/dev_package_examples/get.test.ts → ...s/routes/dev_package_examples/get.test.ts b/...s/routes/dev_package_examples/get.test.ts → ...s/routes/dev_package_examples/get.test.ts
diff --git a/.../routes/dev_package_examples/list.test.ts → .../routes/dev_package_examples/list.test.ts b/.../routes/dev_package_examples/list.test.ts → .../routes/dev_package_examples/list.test.ts
diff --git a/...outes/dev_package_examples/update.test.ts → ...outes/dev_package_examples/update.test.ts b/...outes/dev_package_examples/update.test.ts → ...outes/dev_package_examples/update.test.ts
diff --git a/.../tests/routes/export_files/create.test.ts → api/tests/routes/export_files/create.test.ts b/.../tests/routes/export_files/create.test.ts → api/tests/routes/export_files/create.test.ts
diff --git a/...ests/routes/export_files/download.test.ts → ...ests/routes/export_files/download.test.ts b/...ests/routes/export_files/download.test.ts → ...ests/routes/export_files/download.test.ts
diff --git a/...sts/routes/export_requests/create.test.ts → ...sts/routes/export_requests/create.test.ts b/...sts/routes/export_requests/create.test.ts → ...sts/routes/export_requests/create.test.ts
diff --git a/.../tests/routes/export_requests/get.test.ts → api/tests/routes/export_requests/get.test.ts b/.../tests/routes/export_requests/get.test.ts → api/tests/routes/export_requests/get.test.ts
diff --git a/...tests/routes/export_requests/list.test.ts → ...tests/routes/export_requests/list.test.ts b/...tests/routes/export_requests/list.test.ts → ...tests/routes/export_requests/list.test.ts
diff --git a/...sts/routes/export_requests/update.test.ts → ...sts/routes/export_requests/update.test.ts b/...sts/routes/export_requests/update.test.ts → ...sts/routes/export_requests/update.test.ts
diff --git a/dev-server-api/tests/routes/health.test.ts → api/tests/routes/health.test.ts b/dev-server-api/tests/routes/health.test.ts → api/tests/routes/health.test.ts
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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"
-  ]
 }