Merge remote-tracking branch 'origin/main' into miello/feat/request-context-per-request

Author: miello

examples/erp/drizzlify/collections/categories.ts

@@ -24,7 +24,7 @@ export const categoriesCollection = builder.collection('categories', {
         }),
       })),
       options: builder.options(async ({ db }) => {
-        const result = await db.query.users.findMany({ columns: { id: true, name: true } })
+        const result = await db.query.user.findMany({ columns: { id: true, name: true } })
         return result.map((user) => ({ label: user.name ?? user.id, value: user.id }))
       }),
     })),

examples/erp/drizzlify/collections/posts.ts

@@ -15,7 +15,7 @@ export const postsCollection = builder.collection('posts', {
     }),
     authorId: fb.relations('author', (fb) => ({
       type: 'connect',
-      fields: fb.fields('users', (fb) => ({
+      fields: fb.fields('user', (fb) => ({
         id: fb.columns('id', {
           type: 'text',
         }),
@@ -27,7 +27,7 @@ export const postsCollection = builder.collection('posts', {
         }),
       })),
       options: builder.options(async ({ db }) => {
-        const result = await db.query.users.findMany({ columns: { id: true, name: true } })
+        const result = await db.query.user.findMany({ columns: { id: true, name: true } })
         return result.map((user) => ({ label: user.name, value: user.id }))
       }),
     })),

examples/erp/drizzlify/collections/users.ts

@@ -1,9 +1,9 @@
 import { builder } from '../helper'
 
-export const usersCollection = builder.collection('users', {
+export const usersCollection = builder.collection('user', {
   slug: 'users',
   identifierColumn: 'id',
-  fields: builder.fields('users', (fb) => ({
+  fields: builder.fields('user', (fb) => ({
     id: fb.columns('id', {
       type: 'text',
     }),

packages/core/src/utils.ts

@@ -3,8 +3,12 @@ import { is, Table } from 'drizzle-orm'
 import type { IsNever, Simplify, ValueOf } from 'type-fest'
 import type { ZodError, ZodObject, ZodOptional, ZodType } from 'zod'
 
-import type { MaybePromise } from './collection'
-import type { ApiHttpStatus, ApiRouteHandlerPayloadWithContext, ApiRouteSchema } from './endpoint'
+import type {
+  ApiHttpStatus,
+  ApiRouteHandler,
+  ApiRouteHandlerPayloadWithContext,
+  ApiRouteSchema,
+} from './endpoint'
 import type { Field, FieldRelation, Fields, FieldsInitial, FieldsWithFieldName } from './field'
 
 export function isRelationField(field: Field): field is FieldRelation {
@@ -184,11 +188,11 @@ export function withValidator<
   TContext extends Record<string, unknown>,
 >(
   schema: TApiRouteSchema,
-  handler: (
+  handler: ApiRouteHandler<TContext, TApiRouteSchema>
+): ApiRouteHandler<TContext, TApiRouteSchema> {
+  const wrappedHandler = async (
     payload: ApiRouteHandlerPayloadWithContext<TApiRouteSchema, TContext>
-  ) => MaybePromise<any>
-): (payload: ApiRouteHandlerPayloadWithContext<TApiRouteSchema, TContext>) => MaybePromise<any> {
-  return async (payload: ApiRouteHandlerPayloadWithContext<TApiRouteSchema, TContext>) => {
+  ) => {
     const zodErrors = await validateRequestBody(schema, payload)
     if (zodErrors) {
       return {
@@ -202,7 +206,11 @@ export function withValidator<
 
     const response = await handler(payload)
 
-    const validationError = validateResponseBody(schema, response.status, response.body)
+    const validationError = validateResponseBody(
+      schema,
+      response.status as ApiHttpStatus,
+      response.body
+    )
 
     if (validationError) {
       return {
@@ -216,6 +224,8 @@ export function withValidator<
 
     return response
   }
+
+  return wrappedHandler as ApiRouteHandler<TContext, TApiRouteSchema>
 }
 
 export type JoinArrays<T extends any[]> = Simplify<