equipped 5.0.0-beta-2 → 5.0.0-beta-4

package/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [5.0.0-beta-4](https://github.com/kevinand11/equipped/compare/v5.0.0-beta-3...v5.0.0-beta-4) (2024-05-30)
+
+## [5.0.0-beta-3](https://github.com/kevinand11/equipped/compare/v5.0.0-beta-2...v5.0.0-beta-3) (2024-05-30)
+
+
+### Features
+
+* allow custom validator in validate ([24a1d7a](https://github.com/kevinand11/equipped/commit/24a1d7a7cf69eabc73148dd9d36324d32ba95fc3))
+
 ## [5.0.0-beta-2](https://github.com/kevinand11/equipped/compare/v5.0.0-beta-1...v5.0.0-beta-2) (2024-05-30)
 
 

package/lib/server/impls/fastify.d.ts

@@ -11,7 +11,7 @@ export declare class FastifyServer extends Server<FastifyRequest, FastifyReply>
     protected onLoad(): Promise<void>;
     protected registerRoute(route: FullRoute): void;
     protected startServer(port: number): Promise<boolean>;
-    protected parse(req: FastifyRequest, res: FastifyReply): Promise<Request<import("../types").Api>>;
+    protected parse(req: FastifyRequest, res: FastifyReply): Promise<Request<import("../types").Api<unknown, string, import("../types").MethodTypes, unknown, unknown, unknown, import("../types").SupportedStatusCodes>>>;
     makeController(cb: Defined<Route['handler']>): RouteHandlerMethod;
     makeMiddleware(cb: Defined<Route['middlewares']>[number]['cb']): preHandlerHookHandler<import("fastify").RawServerDefault, import("http").IncomingMessage, import("http").ServerResponse<import("http").IncomingMessage>, import("fastify").RouteGenericInterface, unknown, import("fastify").FastifySchema, import("fastify").FastifyTypeProviderDefault, import("fastify").FastifyBaseLogger>;
     makeErrorMiddleware(cb: Defined<Route['onError']>['cb']): (error: import("fastify").FastifyError, request: FastifyRequest<import("fastify").RouteGenericInterface, import("fastify").RawServerDefault, import("http").IncomingMessage, import("fastify").FastifySchema, import("fastify").FastifyTypeProviderDefault, unknown, import("fastify").FastifyBaseLogger, import("fastify/types/type-provider").ResolveFastifyRequestType<import("fastify").FastifyTypeProviderDefault, import("fastify").FastifySchema, import("fastify").RouteGenericInterface>>, reply: FastifyReply<import("fastify").RawServerDefault, import("http").IncomingMessage, import("http").ServerResponse<import("http").IncomingMessage>, import("fastify").RouteGenericInterface, unknown, import("fastify").FastifySchema, import("fastify").FastifyTypeProviderDefault, unknown>) => void;

package/lib/server/routes.d.ts

@@ -5,5 +5,5 @@ export declare class Router extends ClassPropertiesWrapper<AddMethodImpls> {
     #private;
     constructor(config?: GeneralConfig);
     include(router: Router): void;
-    get routes(): Route[];
+    get routes(): Route<import("./types").ApiDef<import("./types").Api<unknown, string, import("./types").MethodTypes, unknown, unknown, unknown, import("./types").SupportedStatusCodes>>>[];
 }

package/lib/server/types.d.ts

@@ -28,7 +28,7 @@ type ApiResponse<T, StatusCode extends SupportedStatusCodes> = Record<StatusCode
 type Any = object | unknown;
 type Arrayable<T> = T | T[];
 type AllowedResponses = Arrayable<JSONPrimitives | Any>;
-export type Api<Res = AllowedResponses, Key extends string = string, Method extends MethodTypes = MethodTypes, Body extends Any = Any, Params extends Any = Any, Query extends Any = Any, DefaultStatus extends SupportedStatusCodes = SupportedStatusCodes> = {
+export interface Api<Res = AllowedResponses, Key extends string = string, Method extends MethodTypes = MethodTypes, Body extends Any = Any, Params extends Any = Any, Query extends Any = Any, DefaultStatus extends SupportedStatusCodes = SupportedStatusCodes> {
     key: Key;
     method: Method;
     response: Res;
@@ -36,8 +36,8 @@ export type Api<Res = AllowedResponses, Key extends string = string, Method exte
     params?: Params;
     query?: Query;
     defaultStatusCode?: DefaultStatus;
-};
-export type ApiDef<T extends Api = Api> = {
+}
+export interface ApiDef<T extends Api = Api> {
     key: T['key'];
     method: T['method'];
     body: T['body'];
@@ -45,7 +45,7 @@ export type ApiDef<T extends Api = Api> = {
     query: T['query'];
     responses: ApiResponse<T['response'], GetDefaultStatusCode<T['defaultStatusCode']>>;
     __api?: T;
-};
+}
 type Awaitable<T> = Promise<T> | T;
 type Res<T, S extends SupportedStatusCodes> = Awaitable<Response<T, S> | T>;
 type InferApiFromApiDef<T> = T extends ApiDef<infer A> ? A : never;
@@ -55,7 +55,7 @@ export type ErrorHandler<Def extends Api = Api> = (req: Request<Def>, err: Error
 export type RouteMiddlewareHandler<Def extends Api = Api> = (req: Request<Def>) => Awaitable<void>;
 export type HandlerSetup = (route: Route) => void;
 export type RouteSchema = Omit<FastifySchema, 'tags' | 'security' | 'hide'>;
-export type Route<Def extends ApiDef = ApiDef> = {
+export interface Route<Def extends ApiDef = ApiDef> {
     key?: Def['key'];
     path: string;
     method: Def['method'];
@@ -68,7 +68,7 @@ export type Route<Def extends ApiDef = ApiDef> = {
     hideSchema?: boolean;
     security?: Record<string, string[]>[];
     __def?: Def;
-};
+}
 export type RouteConfig<T extends ApiDef = ApiDef> = Omit<Route<T>, 'method' | 'handler'>;
 export type GeneralConfig = Omit<RouteConfig, 'schema' | 'key'>;
 export type AddMethodImpls = {

package/lib/validations/index.d.ts

@@ -154,7 +154,7 @@ export declare const Validation: {
         ignored: boolean;
     };
 };
-export declare const validate: <T extends Record<string, Validate.VCore<any>>>(schema: T, value: unknown) => { [K in keyof T]: import("valleyed/lib/api/base").ExtractI<T[K]>; };
+export declare const validate: <T extends Record<string, Validate.VCore<any>>, S extends Validate.VCore<any> = Validate.VCore<any>>(schema: T | S, value: unknown) => any;
 export declare const Hash: {
     hash: (password: string) => Promise<string>;
     compare: (plainPassword: string, hashed: string) => Promise<boolean>;

package/lib/validations/index.js

@@ -48,7 +48,8 @@ Validate.v.file = (...args) => file(...args).addRule(isNotTruncated());
 exports.Schema = Validate.v;
 exports.Validation = { ...Validate, isNotTruncated, isValidPhone };
 const validate = (schema, value) => {
-    const validity = exports.Validation.v.object(schema).parse(value);
+    const validator = schema instanceof Validate.VCore ? schema : Validate.v.object(schema);
+    const validity = validator.parse(value);
     if (validity.valid)
         return validity.value;
     const errorsObject = validity.errors

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "equipped",
-	"version": "5.0.0-beta-2",
+	"version": "5.0.0-beta-4",
 	"private": false,
 	"description": "",
 	"main": "lib/index.js",