spiceflow 1.0.1 → 1.0.3

package/src/elysia-fork/types.ts

@@ -1,34 +1,31 @@
 // https://github.com/remorses/elysia/blob/main/src/types.ts#L6
+import z from 'zod'
 
 /* eslint-disable @typescript-eslint/no-unused-vars */
 
-import type { BunFile, Serve, Server, WebSocketHandler } from 'bun'
-
 import type {
-	TSchema,
-	TObject,
+	OptionalKind,
 	Static,
-	TAnySchema,
-	TNull,
-	TUndefined,
 	StaticDecode,
-	OptionalKind
+	TAnySchema,
+	TObject,
+	TSchema,
 } from '@sinclair/typebox'
 import type { TypeCheck, ValueError } from '@sinclair/typebox/compiler'
+import type { BunFile, Server } from 'bun'
 
 import type { OpenAPIV3 } from 'openapi-types'
 
+import { Spiceflow } from '../spiceflow'
 import type { Context, ErrorContext, PreContext } from './context'
 import {
 	ELYSIA_RESPONSE,
 	InternalServerError,
-	InvalidCookieSignature,
 	NotFoundError,
 	ParseError,
-	ValidationError
+	ValidationError,
 } from './error'
-import { Spiceflow } from '../spiceflow'
-
+import { ZodTypeAny, ZodObject } from 'zod'
 
 export type MaybeArray<T> = T | T[]
 export type MaybePromise<T> = T | Promise<T>
@@ -93,7 +90,7 @@ export type Reconcile<
 	B extends Object,
 	Override extends boolean = false,
 	// Detect Stack limit, eg. circular dependency
-	Stack extends number[] = []
+	Stack extends number[] = [],
 > = Stack['length'] extends 16
 	? A
 	: Override extends true
@@ -177,10 +174,10 @@ export interface MetadataBase {
 
 export interface RouteSchema {
 	body?: unknown
-	headers?: unknown
+	// headers?: unknown
 	query?: unknown
 	params?: unknown
-	cookie?: unknown
+	// cookie?: unknown
 	response?: unknown
 }
 
@@ -188,11 +185,17 @@ type OptionalField = {
 	[OptionalKind]: 'Optional'
 }
 
+export type TypeSchema = TSchema | ZodTypeAny
+
+export type TypeObject = TObject | ZodObject<any, any, any>
+
 export type UnwrapSchema<
-	Schema extends TSchema | string | undefined,
-	Definitions extends Record<string, unknown> = {}
+	Schema extends TypeSchema | string | undefined,
+	Definitions extends Record<string, unknown> = {},
 > = undefined extends Schema
 	? unknown
+	: Schema extends ZodTypeAny
+	? z.infer<Schema>
 	: Schema extends TSchema
 	? Schema extends OptionalField
 		? Prettify<Partial<Static<Schema>>>
@@ -203,31 +206,16 @@ export type UnwrapSchema<
 		: Definitions
 	: unknown
 
-export type UnwrapBodySchema<
-	Schema extends TSchema | string | undefined,
-	Definitions extends Record<string, unknown> = {}
-> = undefined extends Schema
-	? unknown
-	: Schema extends TSchema
-	? Schema extends OptionalField
-		? Prettify<Partial<Static<Schema>>> | null
-		: StaticDecode<Schema>
-	: Schema extends string
-	? Definitions extends Record<Schema, infer NamedSchema>
-		? NamedSchema
-		: Definitions
-	: unknown
-
 export interface UnwrapRoute<
 	in out Schema extends InputSchema<any>,
-	in out Definitions extends DefinitionBase['type'] = {}
+	in out Definitions extends DefinitionBase['type'] = {},
 > {
-	body: UnwrapBodySchema<Schema['body'], Definitions>
+	body: UnwrapSchema<Schema['body'], Definitions>
 	// headers: UnwrapSchema<Schema['headers'], Definitions>
-	// query: UnwrapSchema<Schema['query'], Definitions>
-	// params: UnwrapSchema<Schema['params'], Definitions>
+	query: UnwrapSchema<Schema['query'], Definitions>
+	params: UnwrapSchema<Schema['params'], Definitions>
 	// cookie: UnwrapSchema<Schema['cookie'], Definitions>
-	response: Schema['response'] extends TSchema | string
+	response: Schema['response'] extends TypeSchema | string
 		? {
 				200: CoExist<
 					UnwrapSchema<Schema['response'], Definitions>,
@@ -235,7 +223,7 @@ export interface UnwrapRoute<
 					BunFile
 				>
 		  }
-		: Schema['response'] extends Record<number, TAnySchema | string>
+		: Schema['response'] extends Record<number, TypeSchema | string>
 		? {
 				[k in keyof Schema['response']]: CoExist<
 					UnwrapSchema<Schema['response'][k], Definitions>,
@@ -246,50 +234,6 @@ export interface UnwrapRoute<
 		: unknown | void
 }
 
-// export interface UnwrapGroupGuardRoute<
-// 	in out Schema extends InputSchema<any>,
-// 	in out Definitions extends Record<string, unknown> = {},
-// 	Path extends string = ''
-// > {
-// 	body: UnwrapBodySchema<Schema['body'], Definitions>
-// 	headers: UnwrapSchema<
-// 		Schema['headers'],
-// 		Definitions
-// 	> extends infer A extends Record<string, unknown>
-// 		? A
-// 		: undefined
-// 	query: UnwrapSchema<
-// 		Schema['query'],
-// 		Definitions
-// 	> extends infer A extends Record<string, unknown>
-// 		? A
-// 		: undefined
-// 	params: UnwrapSchema<
-// 		Schema['params'],
-// 		Definitions
-// 	> extends infer A extends Record<string, unknown>
-// 		? A
-// 		: Path extends `${string}/${':' | '*'}${string}`
-// 		? Record<GetPathParameter<Path>, string>
-// 		: never
-// 	cookie: UnwrapSchema<
-// 		Schema['cookie'],
-// 		Definitions
-// 	> extends infer A extends Record<string, unknown>
-// 		? A
-// 		: undefined
-// 	response: Schema['response'] extends TSchema | string
-// 		? UnwrapSchema<Schema['response'], Definitions>
-// 		: Schema['response'] extends {
-// 				[k in string]: TSchema | string
-// 		  }
-// 		? UnwrapSchema<
-// 				Schema['response'][keyof Schema['response']],
-// 				Definitions
-// 		  >
-// 		: unknown | void
-// }
-
 export type HookContainer<T extends Function = Function> = {
 	checksum?: number
 	scope?: LifeCycleType
@@ -376,27 +320,27 @@ export type HTTPMethod =
 	| 'ALL'
 
 export interface InputSchema<Name extends string = string> {
-	body?: TSchema | Name
+	body?: TypeSchema | Name
 	// headers?: TObject | TNull | TUndefined | Name
-	// query?: TObject | TNull | TUndefined | Name
-	// params?: TObject | TNull | TUndefined | Name
+	query?: TypeObject | Name
+	params?: TypeObject | Name
 	// cookie?: TObject | TNull | TUndefined | Name
 	response?:
-		| TSchema
-		| Record<number, TSchema>
+		| TypeSchema
+		| Record<number, TypeSchema>
 		| Name
-		| Record<number, Name | TSchema>
+		| Record<number, Name | TypeSchema>
 }
 
 export interface MergeSchema<
 	in out A extends RouteSchema,
-	in out B extends RouteSchema
+	in out B extends RouteSchema,
 > {
 	body: undefined extends A['body'] ? B['body'] : A['body']
-	headers: undefined extends A['headers'] ? B['headers'] : A['headers']
+	// headers: undefined extends A['headers'] ? B['headers'] : A['headers']
 	query: undefined extends A['query'] ? B['query'] : A['query']
 	params: undefined extends A['params'] ? B['params'] : A['params']
-	cookie: undefined extends A['cookie'] ? B['cookie'] : A['cookie']
+	// cookie: undefined extends A['cookie'] ? B['cookie'] : A['cookie']
 	response: {} extends A['response']
 		? {} extends B['response']
 			? {}
@@ -414,9 +358,9 @@ export type Handler<
 		derive: {}
 		resolve: {}
 	},
-	Path extends string = ''
+	Path extends string = '',
 > = (
-	context: Context<Route, Singleton, Path>
+	context: Context<Route, Singleton, Path>,
 ) => MaybePromise<
 	{} extends Route['response']
 		? unknown
@@ -458,48 +402,31 @@ export type InlineHandler<
 		resolve: {}
 	},
 	Path extends string = '',
-	MacroContext = {}
-> =
-	| ((
-			context: MacroContext extends Record<
-				string | number | symbol,
-				unknown
-			>
-				? Prettify<MacroContext & Context<Route, Singleton, Path>>
-				: Context<Route, Singleton, Path>
-	  ) =>
-			| Response
-			| MaybePromise<
-					{} extends Route['response']
-						? unknown
-						:
-								| (Route['response'] extends { 200: any }
-										? Route['response']
-										: string | number | boolean | Object)
-								| Route['response'][keyof Route['response']]
-								| {
-										[Status in keyof Route['response']]: {
-											_type: Record<
-												Status,
-												Route['response'][Status]
-											>
-											[ELYSIA_RESPONSE]: Status
-										}
-								  }[keyof Route['response']]
-			  >)
-	| ({} extends Route['response']
-			? string | number | boolean | Object
-			:
-					| (Route['response'] extends { 200: any }
-							? Route['response']
-							: string | number | boolean | Object)
-					| Route['response'][keyof Route['response']]
-					| {
-							[Status in keyof Route['response']]: {
-								_type: Record<Status, Route['response'][Status]>
-								[ELYSIA_RESPONSE]: Status
-							}
-					  }[keyof Route['response']])
+	MacroContext = {},
+> = (
+	context: MacroContext extends Record<string | number | symbol, unknown>
+		? Prettify<MacroContext & Context<Route, Singleton, Path>>
+		: Context<Route, Singleton, Path>,
+) =>
+	| Response
+	| MaybePromise<
+			{} extends Route['response']
+				? unknown
+				:
+						| (Route['response'] extends { 200: any }
+								? Route['response']
+								: string | number | boolean | Object)
+						| Route['response'][keyof Route['response']]
+						| {
+								[Status in keyof Route['response']]: {
+									_type: Record<
+										Status,
+										Route['response'][Status]
+									>
+									[ELYSIA_RESPONSE]: Status
+								}
+						  }[keyof Route['response']]
+	  >
 
 export type OptionalHandler<
 	in out Route extends RouteSchema = {},
@@ -509,9 +436,9 @@ export type OptionalHandler<
 		derive: {}
 		resolve: {}
 	},
-	Path extends string = ''
+	Path extends string = '',
 > = Handler<Route, Singleton, Path> extends (
-	context: infer Context
+	context: infer Context,
 ) => infer Returned
 	? (context: Context) => Returned | MaybePromise<void>
 	: never
@@ -524,16 +451,16 @@ export type AfterHandler<
 		derive: {}
 		resolve: {}
 	},
-	Path extends string = ''
+	Path extends string = '',
 > = Handler<Route, Singleton, Path> extends (
-	context: infer Context
+	context: infer Context,
 ) => infer Returned
 	? (
 			context: Prettify<
 				{
 					response: Route['response']
 				} & Context
-			>
+			>,
 	  ) => Returned | MaybePromise<void>
 	: never
 
@@ -545,7 +472,7 @@ export type MapResponse<
 		derive: {}
 		resolve: {}
 	},
-	Path extends string = ''
+	Path extends string = '',
 > = Handler<
 	Omit<Route, 'response'> & {
 		response: MaybePromise<Response | undefined | unknown>
@@ -565,7 +492,7 @@ export type VoidHandler<
 		store: {}
 		derive: {}
 		resolve: {}
-	}
+	},
 > = (context: Context<Route, Singleton>) => MaybePromise<void>
 
 export type TransformHandler<
@@ -576,7 +503,7 @@ export type TransformHandler<
 		derive: {}
 		resolve: {}
 	},
-	BasePath extends string = ''
+	BasePath extends string = '',
 > = {
 	(
 		context: Prettify<
@@ -587,7 +514,7 @@ export type TransformHandler<
 				},
 				BasePath
 			>
-		>
+		>,
 	): MaybePromise<void>
 }
 
@@ -599,7 +526,7 @@ export type BodyHandler<
 		derive: {}
 		resolve: {}
 	},
-	Path extends string = ''
+	Path extends string = '',
 > = (
 	context: Prettify<
 		{
@@ -620,7 +547,7 @@ export type BodyHandler<
 	 *     })
 	 * ```
 	 */
-	contentType: string
+	contentType: string,
 ) => MaybePromise<any>
 
 export type PreHandler<
@@ -630,7 +557,7 @@ export type PreHandler<
 		store: {}
 		derive: {}
 		resolve: {}
-	}
+	},
 > = (context: PreContext<Singleton>) => MaybePromise<Route['response'] | void>
 
 export type AfterResponseHandler<
@@ -640,17 +567,17 @@ export type AfterResponseHandler<
 		store: {}
 		derive: {}
 		resolve: {}
-	}
+	},
 > = (
 	context: Prettify<
 		Context<Route, Singleton> & {
 			response: Route['response']
 		}
-	>
+	>,
 ) => MaybePromise<void>
 
 export type GracefulHandler<
-	in Instance extends Spiceflow<any, any, any, any, any, any, any, any>
+	in Instance extends Spiceflow<any, any, any, any, any, any, any, any>,
 > = (data: Instance) => any
 
 export type ErrorHandler<
@@ -673,7 +600,7 @@ export type ErrorHandler<
 		derive: {}
 		resolve: {}
 		schema: {}
-	}
+	},
 > = (
 	context: ErrorContext<
 		Route,
@@ -761,22 +688,22 @@ export type ErrorHandler<
 								Volatile['resolve']
 						>
 			  >
-			| Prettify<
-					{
-						request: Request
-						code: 'INVALID_COOKIE_SIGNATURE'
-						error: Readonly<InvalidCookieSignature>
-					} & NeverKey<
-						Singleton['derive'] &
-							Ephemeral['derive'] &
-							Volatile['derive']
-					> &
-						NeverKey<
-							Singleton['derive'] &
-								Ephemeral['resolve'] &
-								Volatile['resolve']
-						>
-			  >
+			// | Prettify<
+			// 		{
+			// 			request: Request
+			// 			code: 'INVALID_COOKIE_SIGNATURE'
+			// 			error: Readonly<InvalidCookieSignature>
+			// 		} & NeverKey<
+			// 			Singleton['derive'] &
+			// 				Ephemeral['derive'] &
+			// 				Volatile['derive']
+			// 		> &
+			// 			NeverKey<
+			// 				Singleton['derive'] &
+			// 					Ephemeral['resolve'] &
+			// 					Volatile['resolve']
+			// 			>
+			//   >
 			| Prettify<
 					{
 						[K in keyof T]: {
@@ -796,7 +723,7 @@ export type ErrorHandler<
 								Volatile['resolve']
 						>
 			  >
-		)
+		),
 ) => any | Promise<any>
 
 export type Isolate<T> = {
@@ -825,7 +752,7 @@ export type LocalHook<
 				params: undefined extends Schema['params']
 					? ResolvePath<Path>
 					: Schema['params']
-		  }
+		  },
 > = (LocalSchema extends {} ? LocalSchema : Isolate<LocalSchema>) &
 	Extension & {
 		/**
@@ -948,54 +875,54 @@ export interface MacroManager<
 		derive: {}
 		resolve: {}
 	},
-	in out Errors extends Record<string, Error> = {}
+	in out Errors extends Record<string, Error> = {},
 > {
 	onParse(fn: MaybeArray<BodyHandler<TypedRoute, Singleton>>): unknown
 	onParse(
 		options: MacroOptions,
-		fn: MaybeArray<BodyHandler<TypedRoute, Singleton>>
+		fn: MaybeArray<BodyHandler<TypedRoute, Singleton>>,
 	): unknown
 
 	onTransform(fn: MaybeArray<VoidHandler<TypedRoute, Singleton>>): unknown
 	onTransform(
 		options: MacroOptions,
-		fn: MaybeArray<VoidHandler<TypedRoute, Singleton>>
+		fn: MaybeArray<VoidHandler<TypedRoute, Singleton>>,
 	): unknown
 
 	onBeforeHandle(
-		fn: MaybeArray<OptionalHandler<TypedRoute, Singleton>>
+		fn: MaybeArray<OptionalHandler<TypedRoute, Singleton>>,
 	): unknown
 	onBeforeHandle(
 		options: MacroOptions,
-		fn: MaybeArray<OptionalHandler<TypedRoute, Singleton>>
+		fn: MaybeArray<OptionalHandler<TypedRoute, Singleton>>,
 	): unknown
 
 	onAfterHandle(fn: MaybeArray<AfterHandler<TypedRoute, Singleton>>): unknown
 	onAfterHandle(
 		options: MacroOptions,
-		fn: MaybeArray<AfterHandler<TypedRoute, Singleton>>
+		fn: MaybeArray<AfterHandler<TypedRoute, Singleton>>,
 	): unknown
 
 	onError(
-		fn: MaybeArray<ErrorHandler<Errors, TypedRoute, Singleton>>
+		fn: MaybeArray<ErrorHandler<Errors, TypedRoute, Singleton>>,
 	): unknown
 	onError(
 		options: MacroOptions,
-		fn: MaybeArray<ErrorHandler<Errors, TypedRoute, Singleton>>
+		fn: MaybeArray<ErrorHandler<Errors, TypedRoute, Singleton>>,
 	): unknown
 
 	mapResponse(fn: MaybeArray<MapResponse<TypedRoute, Singleton>>): unknown
 	mapResponse(
 		options: MacroOptions,
-		fn: MaybeArray<MapResponse<TypedRoute, Singleton>>
+		fn: MaybeArray<MapResponse<TypedRoute, Singleton>>,
 	): unknown
 
 	onAfterResponse(
-		fn: MaybeArray<AfterResponseHandler<TypedRoute, Singleton>>
+		fn: MaybeArray<AfterResponseHandler<TypedRoute, Singleton>>,
 	): unknown
 	onAfterResponse(
 		options: MacroOptions,
-		fn: MaybeArray<AfterResponseHandler<TypedRoute, Singleton>>
+		fn: MaybeArray<AfterResponseHandler<TypedRoute, Singleton>>,
 	): unknown
 
 	events: {
@@ -1010,7 +937,7 @@ export type MacroQueue = HookContainer<
 
 type _CreateEden<
 	Path extends string,
-	Property extends Record<string, unknown> = {}
+	Property extends Record<string, unknown> = {},
 > = Path extends `${infer Start}/${infer Rest}`
 	? {
 			[x in Start]: _CreateEden<Rest, Property>
@@ -1021,7 +948,7 @@ type _CreateEden<
 
 export type CreateEden<
 	Path extends string,
-	Property extends Record<string, unknown> = {}
+	Property extends Record<string, unknown> = {},
 > = Path extends `/${infer Rest}`
 	? _CreateEden<Rest, Property>
 	: Path extends ''
@@ -1073,10 +1000,10 @@ export type MergeSpiceflowInstances<
 		macro: {}
 		macroFn: {}
 	},
-	Routes extends RouteBase = {}
+	Routes extends RouteBase = {},
 > = Instances extends [
 	infer Current extends Spiceflow<any, any, any, any, any, any>,
-	...infer Rest extends Spiceflow<any, any, any, any, any, any>[]
+	...infer Rest extends Spiceflow<any, any, any, any, any, any>[],
 ]
 	? Current['_types']['Scoped'] extends true
 		? MergeSpiceflowInstances<
@@ -1132,7 +1059,7 @@ export type ExcludeSpiceflowResponse<T> = Exclude<
 export type InferContext<
 	T extends Spiceflow<any, any, any, any, any, any, any, any>,
 	Path extends string = T['_types']['Prefix'],
-	Schema extends RouteSchema = T['_types']['Metadata']['schema']
+	Schema extends RouteSchema = T['_types']['Metadata']['schema'],
 > = Context<
 	MergeSchema<Schema, T['_types']['Metadata']['schema']>,
 	T['_types']['Singleton'] & {
@@ -1145,7 +1072,7 @@ export type InferContext<
 export type InferHandler<
 	T extends Spiceflow<any, any, any, any, any, any, any, any>,
 	Path extends string = T['_types']['Prefix'],
-	Schema extends RouteSchema = T['_types']['Metadata']['schema']
+	Schema extends RouteSchema = T['_types']['Metadata']['schema'],
 > = InlineHandler<
 	MergeSchema<Schema, T['_types']['Metadata']['schema']>,
 	T['_types']['Singleton'] & {
@@ -1180,7 +1107,7 @@ export type UnionToIntersect<U> = (
 
 export type ResolveMacroContext<
 	Macro extends BaseMacro,
-	MacroFn extends BaseMacroFn
+	MacroFn extends BaseMacroFn,
 > = UnionToIntersect<
 	{
 		[K in keyof Macro]-?: undefined extends Macro[K]
@@ -1199,7 +1126,7 @@ export type ResolveMacroContext<
 export type ContextAppendType = 'append' | 'override'
 
 export type HigherOrderFunction<
-	T extends (...arg: unknown[]) => Function = (...arg: unknown[]) => Function
+	T extends (...arg: unknown[]) => Function = (...arg: unknown[]) => Function,
 > = (fn: T, request: Request) => ReturnType<T>
 
 // new Spiceflow()