Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion TODO.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
- [ ] CLI
- [x] generate
- [x] migrate
- [ ] db
- [x] push
- [ ] seed
- [x] info
- [x] init
- [x] validate
Expand Down Expand Up @@ -106,5 +109,5 @@
- [ ] Databases
- [x] SQLite
- [x] PostgreSQL
- [ ] Multi-schema
- [x] Multi-schema
- [ ] MySQL
2 changes: 1 addition & 1 deletion packages/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
"@zenstackhq/orm": "workspace:*",
"decimal.js": "catalog:",
"superjson": "^2.2.3",
"ts-japi": "^1.12.0",
"ts-japi": "^1.12.1",
"ts-pattern": "catalog:",
"url-pattern": "^1.0.3",
"zod-validation-error": "catalog:"
Expand Down
14 changes: 7 additions & 7 deletions packages/server/src/adapter/next/app-route-handler.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { SchemaDef } from '@zenstackhq/orm/schema';
import { NextRequest, NextResponse } from 'next/server';
import type { NextRequest } from 'next/server';
import type { AppRouteRequestHandlerOptions } from '.';
import { logInternalError } from '../common';

Expand All @@ -13,11 +13,11 @@ type Context = { params: Promise<{ path: string[] }> };
*/
export default function factory<Schema extends SchemaDef>(
options: AppRouteRequestHandlerOptions<Schema>,
): (req: NextRequest, context: Context) => Promise<NextResponse> {
): (req: NextRequest, context: Context) => Promise<Response> {
return async (req: NextRequest, context: Context) => {
const client = await options.getClient(req);
if (!client) {
return NextResponse.json({ message: 'unable to get ZenStackClient from request context' }, { status: 500 });
return Response.json({ message: 'unable to get ZenStackClient from request context' }, { status: 500 });
}

let params: Awaited<Context['params']>;
Expand All @@ -27,11 +27,11 @@ export default function factory<Schema extends SchemaDef>(
try {
params = await context.params;
} catch {
return NextResponse.json({ message: 'Failed to resolve request parameters' }, { status: 500 });
return Response.json({ message: 'Failed to resolve request parameters' }, { status: 500 });
}

if (!params.path) {
return NextResponse.json(
return Response.json(
{ message: 'missing path parameter' },
{
status: 400,
Expand All @@ -57,10 +57,10 @@ export default function factory<Schema extends SchemaDef>(
requestBody,
client,
});
return NextResponse.json(r.body, { status: r.status });
return Response.json(r.body, { status: r.status });
} catch (err) {
logInternalError(options.apiHandler.log, err);
return NextResponse.json({ message: 'An internal server error occurred' }, { status: 500 });
return Response.json({ message: 'An internal server error occurred' }, { status: 500 });
}
};
}
Loading