@riktajs/core 0.6.0 → 0.7.0

package/dist/core/decorators/apply-decorators.d.ts

@@ -0,0 +1,8 @@
+import 'reflect-metadata';
+type ClassDecorator = <TFunction extends Function>(target: TFunction) => TFunction | void;
+type MethodDecorator = <T>(target: Object, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T> | void;
+type PropertyDecorator = (target: Object, propertyKey: string | symbol) => void;
+type AnyDecorator = ClassDecorator | MethodDecorator | PropertyDecorator;
+export declare function applyDecorators(...decorators: AnyDecorator[]): MethodDecorator & ClassDecorator & PropertyDecorator;
+export declare function SetMetadata<T = unknown>(key: string | symbol, value: T): MethodDecorator & ClassDecorator;
+export {};

package/dist/core/decorators/apply-decorators.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.applyDecorators = applyDecorators;
+exports.SetMetadata = SetMetadata;
+require("reflect-metadata");
+function applyDecorators(...decorators) {
+    return ((target, propertyKey, descriptor) => {
+        for (const decorator of decorators.reverse()) {
+            if (descriptor) {
+                const result = decorator(target, propertyKey, descriptor);
+                if (result) {
+                    descriptor = result;
+                }
+            }
+            else if (propertyKey !== undefined) {
+                decorator(target, propertyKey);
+            }
+            else {
+                const result = decorator(target);
+                if (result) {
+                    return result;
+                }
+            }
+        }
+        if (descriptor) {
+            return descriptor;
+        }
+    });
+}
+function SetMetadata(key, value) {
+    const decoratorFactory = (target, propertyKey, descriptor) => {
+        if (descriptor) {
+            Reflect.defineMetadata(key, value, target.constructor, propertyKey);
+        }
+        else {
+            Reflect.defineMetadata(key, value, target);
+        }
+    };
+    return decoratorFactory;
+}

package/dist/core/decorators/create-param-decorator.d.ts

@@ -0,0 +1,11 @@
+import 'reflect-metadata';
+import { ExecutionContext } from '../guards/execution-context';
+export declare const CUSTOM_PARAM_METADATA: unique symbol;
+export interface CustomParamMetadata<T = unknown> {
+    index: number;
+    factory: CustomParamFactory<T, unknown>;
+    data?: T;
+}
+export type CustomParamFactory<TData = unknown, TResult = unknown> = (data: TData, ctx: ExecutionContext) => TResult | Promise<TResult>;
+export declare function createParamDecorator<TData = unknown, TResult = unknown>(factory: CustomParamFactory<TData, TResult>): (data?: TData) => ParameterDecorator;
+export declare function getCustomParamMetadata<T = unknown>(target: Function, propertyKey: string | symbol): CustomParamMetadata<T>[];

package/dist/core/decorators/create-param-decorator.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CUSTOM_PARAM_METADATA = void 0;
+exports.createParamDecorator = createParamDecorator;
+exports.getCustomParamMetadata = getCustomParamMetadata;
+require("reflect-metadata");
+exports.CUSTOM_PARAM_METADATA = Symbol.for('rikta:custom:param:metadata');
+function createParamDecorator(factory) {
+    return (data) => {
+        return (target, propertyKey, parameterIndex) => {
+            if (propertyKey === undefined)
+                return;
+            const existingParams = Reflect.getMetadata(exports.CUSTOM_PARAM_METADATA, target.constructor, propertyKey) ?? [];
+            const metadata = {
+                index: parameterIndex,
+                factory: factory,
+                data,
+            };
+            existingParams.push(metadata);
+            Reflect.defineMetadata(exports.CUSTOM_PARAM_METADATA, existingParams, target.constructor, propertyKey);
+        };
+    };
+}
+function getCustomParamMetadata(target, propertyKey) {
+    return Reflect.getMetadata(exports.CUSTOM_PARAM_METADATA, target, propertyKey) ?? [];
+}

package/dist/core/decorators/index.d.ts

@@ -5,3 +5,5 @@ export * from './param.decorator';
 export * from './autowired.decorator';
 export * from './provider.decorator';
 export * from './config-property.decorator';
+export * from './create-param-decorator';
+export * from './apply-decorators';

package/dist/core/decorators/index.js

@@ -21,3 +21,5 @@ __exportStar(require("./param.decorator"), exports);
 __exportStar(require("./autowired.decorator"), exports);
 __exportStar(require("./provider.decorator"), exports);
 __exportStar(require("./config-property.decorator"), exports);
+__exportStar(require("./create-param-decorator"), exports);
+__exportStar(require("./apply-decorators"), exports);

package/dist/core/router/router.d.ts

@@ -13,7 +13,7 @@ export declare class Router {
     private registerRoute;
     private compileParamResolvers;
     private createParamExtractor;
-    private resolveParamsOptimized;
+    private resolveAllParams;
     private resolveGuardInstances;
     private executeGuardsOptimized;
     private resolveMiddlewareInstances;

package/dist/core/router/router.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Router = void 0;
 require("reflect-metadata");
 const constants_1 = require("../constants");
+const create_param_decorator_1 = require("../decorators/create-param-decorator");
 const validation_exception_1 = require("../exceptions/validation.exception");
 const exceptions_1 = require("../exceptions/exceptions");
 const execution_context_1 = require("../guards/execution-context");
@@ -38,28 +39,41 @@ class Router {
             throw new Error(`Handler ${String(route.handlerName)} not found on ${controllerClass.name}`);
         }
         const paramsMeta = Reflect.getMetadata(constants_1.PARAM_METADATA, controllerClass, route.handlerName) ?? [];
+        const customParamsMeta = (0, create_param_decorator_1.getCustomParamMetadata)(controllerClass, route.handlerName);
         const statusCode = Reflect.getMetadata(constants_1.HTTP_CODE_METADATA, controllerClass, route.handlerName);
         const guards = (0, use_guards_decorator_1.getGuardsMetadata)(controllerClass, route.handlerName);
         const middleware = (0, use_middleware_decorator_1.getMiddlewareMetadata)(controllerClass, route.handlerName);
         const compiledResolvers = this.compileParamResolvers(paramsMeta);
-        const hasParams = compiledResolvers.length > 0;
-        const maxParamIndex = hasParams ? Math.max(...compiledResolvers.map(r => r.index)) : -1;
+        const hasBuiltinParams = compiledResolvers.length > 0;
+        const hasCustomParams = customParamsMeta.length > 0;
+        const hasParams = hasBuiltinParams || hasCustomParams;
+        const allParamIndexes = [
+            ...compiledResolvers.map(r => r.index),
+            ...customParamsMeta.map(r => r.index)
+        ];
+        const maxParamIndex = hasParams ? Math.max(...allParamIndexes) : -1;
         const guardInstances = this.resolveGuardInstances(guards);
         const hasGuards = guardInstances.length > 0;
         const middlewareInstances = this.resolveMiddlewareInstances(middleware);
         const hasMiddleware = middlewareInstances.length > 0;
-        const createContext = hasGuards
+        const needsContext = hasGuards || hasCustomParams;
+        const createContext = needsContext
             ? (req, rep) => new execution_context_1.ExecutionContextImpl(req, rep, controllerClass, route.handlerName)
             : null;
         const routeHandler = async (request, reply) => {
-            if (createContext) {
-                await this.executeGuardsOptimized(guardInstances, createContext(request, reply));
+            const executionContext = createContext ? createContext(request, reply) : null;
+            if (hasGuards && executionContext) {
+                await this.executeGuardsOptimized(guardInstances, executionContext);
             }
             if (hasMiddleware) {
                 await this.executeMiddlewareChain(middlewareInstances, request, reply);
             }
-            const result = hasParams
-                ? await handler.apply(controllerInstance, this.resolveParamsOptimized(compiledResolvers, maxParamIndex, request, reply))
+            let args;
+            if (hasParams) {
+                args = await this.resolveAllParams(compiledResolvers, customParamsMeta, maxParamIndex, request, reply, executionContext);
+            }
+            const result = args
+                ? await handler.apply(controllerInstance, args)
                 : await handler.call(controllerInstance);
             if (statusCode)
                 reply.status(statusCode);
@@ -113,8 +127,8 @@ class Router {
                 return () => undefined;
         }
     }
-    resolveParamsOptimized(resolvers, maxIndex, request, reply) {
-        const context = {
+    async resolveAllParams(compiledResolvers, customParams, maxIndex, request, reply, executionContext) {
+        const routeContext = {
             request,
             reply,
             params: request.params,
@@ -122,9 +136,9 @@ class Router {
             body: request.body,
         };
         const args = new Array(maxIndex + 1);
-        for (let i = 0; i < resolvers.length; i++) {
-            const resolver = resolvers[i];
-            let value = resolver.extract(context);
+        for (let i = 0; i < compiledResolvers.length; i++) {
+            const resolver = compiledResolvers[i];
+            let value = resolver.extract(routeContext);
             if (resolver.zodSchema) {
                 const result = resolver.zodSchema.safeParse(value);
                 if (!result.success) {
@@ -134,6 +148,13 @@ class Router {
             }
             args[resolver.index] = value;
         }
+        if (customParams.length > 0) {
+            const ctx = executionContext ?? new execution_context_1.ExecutionContextImpl(request, reply, {}, '');
+            for (const customParam of customParams) {
+                const value = await customParam.factory(customParam.data, ctx);
+                args[customParam.index] = value;
+            }
+        }
         return args;
     }
     resolveGuardInstances(guards) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riktajs/core",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "A fast and modern TypeScript backend framework with zero-config autowiring, powered by Fastify",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",