Skip to content
This repository has been archived by the owner on Jan 2, 2025. It is now read-only.

Commit

Permalink
refactor to winterspec
Browse files Browse the repository at this point in the history
  • Loading branch information
seveibar committed Jul 4, 2024
1 parent 60420af commit f581cb2
Show file tree
Hide file tree
Showing 20 changed files with 48 additions and 1,229 deletions.
Binary file modified dev-server-api/bun.lockb
Binary file not shown.
1,201 changes: 0 additions & 1,201 deletions dev-server-api/package-lock.json

This file was deleted.

2 changes: 1 addition & 1 deletion dev-server-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
},
"dependencies": {
"better-sqlite3": "^11.0.0",
"edgespec": "^0.0.69",
"kysely": "^0.27.3",
"kysely-bun-sqlite": "^0.3.2",
"winterspec": "0.0.79",
"zod": "^3.22.4"
}
}
4 changes: 2 additions & 2 deletions dev-server-api/routes/api/dev_package_examples/create.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { withEdgeSpec } from "src/with-edge-spec"
import { withWinterSpec } from "src/with-winter-spec"
import { NotFoundError } from "edgespec/middleware"
import { z } from "zod"

export default withEdgeSpec({
export default withWinterSpec({
methods: ["POST"],
jsonBody: z.object({
file_path: z.string(),
Expand Down
4 changes: 2 additions & 2 deletions dev-server-api/routes/api/dev_package_examples/get.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { withEdgeSpec } from "src/with-edge-spec"
import { withWinterSpec } from "src/with-winter-spec"
import { NotFoundError } from "edgespec/middleware"
import { z } from "zod"

export default withEdgeSpec({
export default withWinterSpec({
methods: ["GET", "POST"],
commonParams: z.object({
dev_package_example_id: z.coerce.number(),
Expand Down
4 changes: 2 additions & 2 deletions dev-server-api/routes/api/dev_package_examples/list.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { sql } from "kysely"
import { withEdgeSpec } from "src/with-edge-spec"
import { withWinterSpec } from "src/with-winter-spec"
import { z } from "zod"

export default withEdgeSpec({
export default withWinterSpec({
methods: ["GET", "POST"],
jsonResponse: z.object({
dev_package_examples: z.array(
Expand Down
4 changes: 2 additions & 2 deletions dev-server-api/routes/api/dev_package_examples/update.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { withEdgeSpec } from "src/with-edge-spec"
import { withWinterSpec } from "src/with-winter-spec"
import { NotFoundError } from "edgespec/middleware"
import { z } from "zod"

export default withEdgeSpec({
export default withWinterSpec({
methods: ["POST"],
jsonBody: z.object({
dev_package_example_id: z.coerce.number(),
Expand Down
2 changes: 1 addition & 1 deletion dev-server-api/routes/api/dev_server/reset.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { sql } from "kysely"
import { withEdgeSpec } from "src/with-edge-spec"
import { withWinterSpec } from "src/with-winter-spec"
import { z } from "zod"
import { unlinkSync } from "fs"
import { getDbFilePath } from "src/db/get-db"
Expand Down
4 changes: 2 additions & 2 deletions dev-server-api/routes/api/export_files/create.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { publicMapExportFile } from "src/lib/public-mapping/public-map-export-file"
import { export_file } from "src/lib/zod/export_file"
import { withEdgeSpec } from "src/with-edge-spec"
import { withWinterSpec } from "src/with-winter-spec"
import { z } from "zod"

export default withEdgeSpec({
export default withWinterSpec({
methods: ["POST"],
jsonBody: z.object({
export_request_id: z.number().int(),
Expand Down
4 changes: 2 additions & 2 deletions dev-server-api/routes/api/export_files/download.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { publicMapExportFile } from "src/lib/public-mapping/public-map-export-file"
import { export_file } from "src/lib/zod/export_file"
import { withEdgeSpec } from "src/with-edge-spec"
import { withWinterSpec } from "src/with-winter-spec"
import { z } from "zod"

export default withEdgeSpec({
export default withWinterSpec({
methods: ["GET"],
queryParams: z.object({
export_file_id: z.coerce.number().int(),
Expand Down
4 changes: 2 additions & 2 deletions dev-server-api/routes/api/export_requests/create.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { withEdgeSpec } from "src/with-edge-spec"
import { withWinterSpec } from "src/with-winter-spec"
import { NotFoundError } from "edgespec/middleware"
import { z } from "zod"
import { export_request } from "src/lib/zod/export_request"
import { publicMapExportRequest } from "src/lib/public-mapping/public-map-export-request"
import { export_parameters } from "../../../src/lib/zod/export_parameters"

export default withEdgeSpec({
export default withWinterSpec({
methods: ["POST"],
jsonBody: z.object({
example_file_path: z.string(),
Expand Down
4 changes: 2 additions & 2 deletions dev-server-api/routes/api/export_requests/get.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { withEdgeSpec } from "src/with-edge-spec"
import { withWinterSpec } from "src/with-winter-spec"
import { z } from "zod"
import { export_request } from "src/lib/zod/export_request"
import { publicMapExportRequest } from "src/lib/public-mapping/public-map-export-request"

export default withEdgeSpec({
export default withWinterSpec({
methods: ["GET", "POST"],
commonParams: z.object({
export_request_id: z.coerce.number(),
Expand Down
4 changes: 2 additions & 2 deletions dev-server-api/routes/api/export_requests/list.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { withEdgeSpec } from "src/with-edge-spec"
import { withWinterSpec } from "src/with-winter-spec"
import { z } from "zod"
import { export_request } from "src/lib/zod/export_request"
import { publicMapExportRequest } from "src/lib/public-mapping/public-map-export-request"

export default withEdgeSpec({
export default withWinterSpec({
methods: ["GET", "POST"],
commonParams: z.object({
is_complete: z.boolean().nullable().default(null),
Expand Down
4 changes: 2 additions & 2 deletions dev-server-api/routes/api/export_requests/update.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { withEdgeSpec } from "src/with-edge-spec"
import { withWinterSpec } from "src/with-winter-spec"
import { NotFoundError } from "edgespec/middleware"
import { z } from "zod"
import { export_request } from "src/lib/zod/export_request"
import { publicMapExportRequest } from "src/lib/public-mapping/public-map-export-request"
import { export_parameters } from "src/lib/zod/export_parameters"

export default withEdgeSpec({
export default withWinterSpec({
methods: ["POST"],
jsonBody: z.object({
export_request_id: z.coerce.number(),
Expand Down
4 changes: 2 additions & 2 deletions dev-server-api/routes/api/health.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { withEdgeSpec } from "../../src/with-edge-spec"
import { withWinterSpec } from "../../src/with-winter-spec"
import { z } from "zod"

export default withEdgeSpec({
export default withWinterSpec({
methods: ["GET", "POST"],
jsonResponse: z.object({
ok: z.boolean(),
Expand Down
11 changes: 11 additions & 0 deletions dev-server-api/routes/health.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import { withWinterSpec } from "../src/with-winter-spec"
import { z } from "zod"

export default withWinterSpec({
methods: ["GET", "POST"],
jsonResponse: z.object({
ok: z.boolean(),
}),
})(async (req, ctx) => {
return ctx.json({ ok: true })
})
9 changes: 9 additions & 0 deletions dev-server-api/server.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { createFetchHandlerFromDir } from "winterspec/adapters/node"

const serverFetch = await createFetchHandlerFromDir("./routes")

console.log("starting dev-server-api on localhost:3021")
Bun.serve({
fetch: (req) => serverFetch(req),
port: 3021,
})
2 changes: 1 addition & 1 deletion dev-server-api/src/middlewares/with-db.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { Middleware } from "edgespec"
import type { Middleware } from "winterspec"
import { getDb, type DbClient } from "../db/get-db"

export const withDb: Middleware<
Expand Down
2 changes: 1 addition & 1 deletion dev-server-api/src/middlewares/with-error-response.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { NotFoundError, type Middleware } from "edgespec/middleware"
import { NotFoundError, type Middleware } from "winterspec/middleware"
import kleur from "kleur"

export const withErrorResponse: Middleware<{}, {}> = async (req, ctx, next) => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { createWithEdgeSpec } from "edgespec"
import { createWithWinterSpec } from "winterspec"
import { withDb } from "./middlewares/with-db"
import { withErrorResponse } from "./middlewares/with-error-response"

export const withEdgeSpec = createWithEdgeSpec({
export const withWinterSpec = createWithWinterSpec({
authMiddleware: {},
beforeAuthMiddleware: [withErrorResponse, withDb],
})

0 comments on commit f581cb2

Please sign in to comment.