arkos 1.4.0-canary.6 → 1.4.0-canary.7

package/dist/cjs/exports/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/exports/index.ts"],"names":[],"mappings":";;;;;;AACA,uEAAmE;AA0BjE,+FA1BO,gCAAc,OA0BP;AAzBhB,sCAAoD;AA4BlD,+FA5BgB,uBAAc,OA4BhB;AA3BhB,yEAAgD;AAoD9C,sBApDK,sBAAW,CAoDL;AArCb,MAAM,KAAK,GAAG;IACZ,IAAI,EAAE,gBAAO;CACd,CAAC;AA2CF,kBAAe,KAAK,CAAC","sourcesContent":["import { RouterConfig } from \"../types/router-config\";\nimport { BaseController } from \"./../modules/base/base.controller\";\nimport { initApp, getArkosConfig } from \"../server\";\nimport ArkosRouter from \"../utils/arkos-router\";\nimport {\n  ArkosRequest,\n  ArkosResponse,\n  ArkosNextFunction,\n  ArkosRequestHandler,\n} from \"../types\";\nimport { ArkosConfig } from \"../types/arkos-config\";\n\n/**\n * Initializes the Arkos application.\n *\n * @module arkos\n * @property {Function} init - Function to initialize the app.\n */\nconst arkos = {\n  init: initApp,\n};\n\nexport {\n  ArkosRequest,\n  ArkosResponse,\n  ArkosNextFunction,\n  ArkosRequestHandler,\n  BaseController,\n  ArkosConfig,\n  RouterConfig,\n  getArkosConfig,\n  /**\n   * Creates an enhanced Express Router with features like OpenAPI documentation capabilities and smart data validation.\n   *\n   * The ArkosRouter extends the standard Express Router with the ability to\n   * automatically capture OpenAPI metadata from route configurations.\n   *\n   * @example\n   * const router = ArkosRouter();\n   *\n   * router.get(\n   *   {\n   *     route: \"/users/:id\",\n   *     openapi: {\n   *       summary: \"Get user by ID\",\n   *       tags: [\"Users\"]\n   *     }\n   *   },\n   *   (req, res) => { ... }\n   * );\n   *\n   * @returns {IArkosRouter} A proxied Express Router instance with enhanced OpenAPI capabilities\n   *\n   * @see {@link ArkosRouteConfig} for configuration options\n   */\n  ArkosRouter,\n};\n\n/**\n * Main entry point for the Arkos module.\n *\n * @module arkos\n */\nexport default arkos;\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/exports/index.ts"],"names":[],"mappings":";;;;;;AACA,uEAAmE;AA2BjE,+FA3BO,gCAAc,OA2BP;AA1BhB,sCAAoD;AA6BlD,+FA7BgB,uBAAc,OA6BhB;AA5BhB,yEAAgD;AAqD9C,sBArDK,sBAAW,CAqDL;AArCb,MAAM,KAAK,GAAG;IACZ,IAAI,EAAE,gBAAO;CACd,CAAC;AA4CF,kBAAe,KAAK,CAAC","sourcesContent":["import { RouterConfig } from \"../types/router-config\";\nimport { BaseController } from \"./../modules/base/base.controller\";\nimport { initApp, getArkosConfig } from \"../server\";\nimport ArkosRouter from \"../utils/arkos-router\";\nimport { ArkosRouteConfig } from \"../utils/arkos-router/types\";\nimport {\n  ArkosRequest,\n  ArkosResponse,\n  ArkosNextFunction,\n  ArkosRequestHandler,\n} from \"../types\";\nimport { ArkosConfig } from \"../types/arkos-config\";\n\n/**\n * Initializes the Arkos application.\n *\n * @module arkos\n * @property {Function} init - Function to initialize the app.\n */\nconst arkos = {\n  init: initApp,\n};\n\nexport {\n  ArkosRequest,\n  ArkosResponse,\n  ArkosNextFunction,\n  ArkosRequestHandler,\n  BaseController,\n  ArkosConfig,\n  RouterConfig,\n  getArkosConfig,\n  /**\n   * Creates an enhanced Express Router with features like OpenAPI documentation capabilities and smart data validation.\n   *\n   * The ArkosRouter extends the standard Express Router with the ability to\n   * automatically capture OpenAPI metadata from route configurations.\n   *\n   * @example\n   * const router = ArkosRouter();\n   *\n   * router.get(\n   *   {\n   *     route: \"/users/:id\",\n   *     openapi: {\n   *       summary: \"Get user by ID\",\n   *       tags: [\"Users\"]\n   *     }\n   *   },\n   *   (req, res) => { ... }\n   * );\n   *\n   * @returns {IArkosRouter} A proxied Express Router instance with enhanced OpenAPI capabilities\n   *\n   * @see {@link ArkosRouteConfig} for configuration options\n   */\n  ArkosRouter,\n  ArkosRouteConfig,\n};\n\n/**\n * Main entry point for the Arkos module.\n *\n * @module arkos\n */\nexport default arkos;\n"]}

package/dist/cjs/modules/base/base.middlewares.js

@@ -92,14 +92,13 @@ function handleRequestBodyValidationAndTransformation(schemaOrDtoClass, classVal
         next();
     });
 }
-function validateRequestInputs(validators) {
+function validateRequestInputs(validationRouteConfig) {
     const arkosConfig = (0, server_1.getArkosConfig)();
     const validationConfig = arkosConfig.validation;
     const strictValidation = validationConfig?.strict;
+    const validators = validationRouteConfig?.validation;
     if (!validationConfig?.resolver && validators)
         throw Error("Trying to pass validators into route config validation option without choosing a validation resolver under arkos.init({ validation: {} }).");
-    if (strictValidation && !validators && validators !== false)
-        throw Error("When using strict validation you must either pass { validation: false } in order to explicitly tell that no input will be received, or pass `undefined` for each input type e.g { validation: { query: undefined } } in order to deny the input of given request input.");
     const validatorFn = validationConfig?.resolver == "zod" ? validate_schema_1.default : validate_dto_1.default;
     const validatorsKey = [
         "body",
@@ -116,7 +115,7 @@ function validateRequestInputs(validators) {
             if (key in validators &&
                 validators?.[key] !== undefined &&
                 !isValidValidator(validators[key]))
-                throw Error(`Please pass a valid ${validatorName} in order to use in { validation: { ${key}: ${validatorNameType} } }`);
+                throw Error(`Please provide a valid ${validatorName} in order to use in { validation: { ${key}: ${validatorNameType} } }`);
         });
     return (0, error_handler_1.catchAsync)(async (req, _, next) => {
         for (const key of validatorsKey) {

package/dist/cjs/modules/base/base.middlewares.js.map

@@ -1 +1 @@
-{"version":3,"file":"base.middlewares.js","sourceRoot":"","sources":["../../../../src/modules/base/base.middlewares.ts"],"names":[],"mappings":"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","sourcesContent":["import { NextFunction, Request, Response } from \"express\";\nimport {\n  PrismaQueryOptions,\n  ArkosNextFunction,\n  ArkosRequest,\n  ArkosRequestHandler,\n  ArkosResponse,\n  AuthPrismaQueryOptions,\n} from \"../../types\";\nimport { getArkosConfig } from \"../../server\";\nimport deepmerge from \"../../utils/helpers/deepmerge.helper\";\nimport { AppError, catchAsync } from \"../../exports/error-handler\";\nimport validateDto from \"../../utils/validate-dto\";\nimport validateSchema from \"../../utils/validate-schema\";\nimport { ZodSchema } from \"zod\";\nimport { ClassConstructor } from \"class-transformer\";\nimport { ValidatorOptions } from \"class-validator\";\nimport { resolvePrismaQueryOptions } from \"./utils/helpers/base.middlewares.helpers\";\nimport { ArkosRouteConfig } from \"../../utils/arkos-router/types\";\nimport { capitalize } from \"../../utils/helpers/text.helpers\";\nimport { isClass, isZodSchema } from \"../../utils/dynamic-loader\";\n\nexport function callNext(_: Request, _1: Response, next: NextFunction) {\n  next();\n}\n\nexport function sendResponse(req: ArkosRequest, res: ArkosResponse) {\n  if (Number(req?.responseStatus) === 204)\n    res.status(Number(req?.responseStatus)).send();\n  else if (req.responseData && req?.responseStatus)\n    res.status(Number(req?.responseStatus)).json(req.responseData);\n  else if (Number(req?.responseStatus) && !req.responseData)\n    res.status(Number(req?.responseStatus)).send();\n  else\n    res\n      .status(500)\n      .json({ message: \"No status or data attached to the response\" });\n}\n\nexport function addRouteMiddlwaresAndConfigs() {}\n\n/**\n * Type representing all possible actions that can be performed on a controller\n * Combines both standard CRUD operations and auth-specific operations\n */\nexport type ControllerActions =\n  | keyof PrismaQueryOptions<any>\n  | keyof Omit<AuthPrismaQueryOptions<any>, keyof PrismaQueryOptions<any>>;\n\n/**\n * Middleware to add Prisma query options to the request's query parameters.\n *\n * @template T - The type of the Prisma model.\n * @param {PrismaQueryOptions<T> | AuthPrismaQueryOptions<T>} prismaQueryOptions - The Prisma query options to attach.\n * @param {ControllerActions} action - The controller action to apply.\n * @returns A middleware function that attaches the query options to the request.\n */\nexport function addPrismaQueryOptionsToRequest<T extends Record<string, any>>(\n  prismaQueryOptions: PrismaQueryOptions<T> | AuthPrismaQueryOptions<T>,\n  action: ControllerActions\n) {\n  return (req: ArkosRequest, _: ArkosResponse, next: NextFunction) => {\n    const configs = getArkosConfig();\n\n    const resolvedOptions = resolvePrismaQueryOptions(\n      prismaQueryOptions,\n      action\n    );\n\n    const requestQueryOptions = configs?.request?.parameters\n      ?.allowDangerousPrismaQueryOptions\n      ? JSON.parse((req.query?.prismaQueryOptions as string) || \"{}\")\n      : {};\n\n    req.prismaQueryOptions = deepmerge(resolvedOptions, requestQueryOptions);\n\n    next();\n  };\n}\n\n/**\n * Logs request events with colored text such as errors, requests responses.\n *\n */\nexport function handleRequestLogs(\n  req: Request,\n  res: Response,\n  next: NextFunction\n) {\n  const startTime = Date.now();\n\n  const methodColors = {\n    GET: \"\\x1b[36m\", // Cyan\n    POST: \"\\x1b[32m\", // Green\n    PUT: \"\\x1b[33m\", // Orange/Yellow\n    PATCH: \"\\x1b[33m\", // Orange/Yellow\n    DELETE: \"\\x1b[31m\", // Red\n    HEAD: \"\\x1b[34m\", // Blue\n    OPTIONS: \"\\x1b[34m\", // Blue\n  };\n\n  const getStatusColor = (statusCode: number) => {\n    if (statusCode >= 200 && statusCode < 300) return \"\\x1b[32m\"; // Green\n    if (statusCode >= 300 && statusCode < 400) return \"\\x1b[33m\"; // Orange/Yellow\n    if (statusCode >= 400 && statusCode < 500) return \"\\x1b[33m\"; // Red\n    if (statusCode >= 500) return \"\\x1b[31m\"; // White on Red background\n    return \"\\x1b[0m\";\n  };\n\n  res.on(\"finish\", () => {\n    const duration = Date.now() - startTime;\n\n    const now = new Date();\n    const time = now.toTimeString().split(\" \")[0];\n\n    const methodColor =\n      methodColors[req.method as keyof typeof methodColors] || \"\\x1b[0m\";\n    const statusColor = getStatusColor(res.statusCode);\n\n    console.info(\n      `[\\x1b[36mInfo\\x1b[0m] \\x1b[90m${time}\\x1b[0m ${methodColor}${\n        req.method\n      }\\x1b[0m ${decodeURIComponent(req.originalUrl)} ${statusColor}${\n        res.statusCode\n      }\\x1b[0m \\x1b[35m${duration}ms\\x1b[0m`\n    );\n  });\n\n  next();\n}\n\nexport function handleRequestBodyValidationAndTransformation<T extends object>(\n  schemaOrDtoClass?: ClassConstructor<T>,\n  classValidatorValidationOptions?: ValidatorOptions\n): ArkosRequestHandler;\nexport function handleRequestBodyValidationAndTransformation<T extends object>(\n  schemaOrDtoClass?: ZodSchema<T>\n): ArkosRequestHandler;\nexport function handleRequestBodyValidationAndTransformation<T extends object>(\n  schemaOrDtoClass?: ZodSchema<T> | ClassConstructor<T>,\n  classValidatorValidationOptions?: ValidatorOptions\n) {\n  return catchAsync(\n    async (req: ArkosRequest, _: ArkosResponse, next: ArkosNextFunction) => {\n      const validationConfigs = getArkosConfig()?.validation;\n      let body = req.body;\n\n      if (validationConfigs?.resolver === \"class-validator\" && schemaOrDtoClass)\n        req.body = await validateDto(\n          schemaOrDtoClass as ClassConstructor<T>,\n          body,\n          deepmerge(\n            {\n              whitelist: true,\n              ...classValidatorValidationOptions,\n            },\n            validationConfigs?.validationOptions || {}\n          )\n        );\n      else if (validationConfigs?.resolver === \"zod\" && schemaOrDtoClass)\n        req.body = await validateSchema(schemaOrDtoClass as ZodSchema<T>, body);\n\n      next();\n    }\n  );\n}\n\nexport function validateRequestInputs(\n  validators: ArkosRouteConfig[\"validation\"]\n) {\n  const arkosConfig = getArkosConfig();\n  const validationConfig = arkosConfig.validation;\n  const strictValidation = validationConfig?.strict;\n\n  if (!validationConfig?.resolver && validators)\n    throw Error(\n      \"Trying to pass validators into route config validation option without choosing a validation resolver under arkos.init({ validation: {} }).\"\n    );\n\n  if (strictValidation && !validators && validators !== false)\n    throw Error(\n      \"When using strict validation you must either pass { validation: false } in order to explicitly tell that no input will be received, or pass `undefined` for each input type e.g { validation: { query: undefined } } in order to deny the input of given request input.\"\n    );\n\n  const validatorFn: (validator: any, data: any) => Promise<any> =\n    validationConfig?.resolver == \"zod\" ? validateSchema : validateDto;\n  const validatorsKey: (\"body\" | \"query\" | \"params\")[] = [\n    \"body\",\n    \"query\",\n    \"params\",\n  ];\n\n  const isValidValidator =\n    validationConfig?.resolver == \"zod\" ? isZodSchema : isClass;\n  const validatorName =\n    validationConfig?.resolver == \"zod\" ? \"Zod Schema\" : \"Class-Validator Dto\";\n  const validatorNameType =\n    validationConfig?.resolver == \"zod\" ? \"Schema\" : \"Dto\";\n\n  if (validators)\n    validatorsKey.forEach((key) => {\n      if (strictValidation && !(key in validators))\n        throw Error(\n          `No { validation: { ${key}: ${validatorNameType} } } was found, while using strict validation you will need to pass undefined into ${key} in order to deny any request ${key} input.`\n        );\n\n      if (\n        key in validators &&\n        validators?.[key] !== undefined &&\n        !isValidValidator(validators[key])\n      )\n        throw Error(\n          `Please pass a valid ${validatorName} in order to use in { validation: { ${key}: ${validatorNameType} } }`\n        );\n    });\n\n  return catchAsync(\n    async (req: ArkosRequest, _: ArkosResponse, next: ArkosNextFunction) => {\n      for (const key of validatorsKey) {\n        const validator = validators?.[key];\n\n        if (strictValidation && !validator && Object.keys(req[key]).length > 0)\n          throw new AppError(\n            `No request ${key} is allowed on this route`,\n            400,\n            { [key]: req[key] },\n            `NoRequest${capitalize(key)}Allowed`\n          );\n\n        if (validator) req[key] = await validatorFn(validator, req[key]);\n      }\n\n      next();\n    }\n  );\n}\n"]}
+{"version":3,"file":"base.middlewares.js","sourceRoot":"","sources":["../../../../src/modules/base/base.middlewares.ts"],"names":[],"mappings":"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","sourcesContent":["import { NextFunction, Request, Response } from \"express\";\nimport {\n  PrismaQueryOptions,\n  ArkosNextFunction,\n  ArkosRequest,\n  ArkosRequestHandler,\n  ArkosResponse,\n  AuthPrismaQueryOptions,\n} from \"../../types\";\nimport { getArkosConfig } from \"../../server\";\nimport deepmerge from \"../../utils/helpers/deepmerge.helper\";\nimport { AppError, catchAsync } from \"../../exports/error-handler\";\nimport validateDto from \"../../utils/validate-dto\";\nimport validateSchema from \"../../utils/validate-schema\";\nimport { ZodSchema } from \"zod\";\nimport { ClassConstructor } from \"class-transformer\";\nimport { ValidatorOptions } from \"class-validator\";\nimport { resolvePrismaQueryOptions } from \"./utils/helpers/base.middlewares.helpers\";\nimport { ArkosRouteConfig } from \"../../utils/arkos-router/types\";\nimport { capitalize } from \"../../utils/helpers/text.helpers\";\nimport { isClass, isZodSchema } from \"../../utils/dynamic-loader\";\n\nexport function callNext(_: Request, _1: Response, next: NextFunction) {\n  next();\n}\n\nexport function sendResponse(req: ArkosRequest, res: ArkosResponse) {\n  if (Number(req?.responseStatus) === 204)\n    res.status(Number(req?.responseStatus)).send();\n  else if (req.responseData && req?.responseStatus)\n    res.status(Number(req?.responseStatus)).json(req.responseData);\n  else if (Number(req?.responseStatus) && !req.responseData)\n    res.status(Number(req?.responseStatus)).send();\n  else\n    res\n      .status(500)\n      .json({ message: \"No status or data attached to the response\" });\n}\n\nexport function addRouteMiddlwaresAndConfigs() {}\n\n/**\n * Type representing all possible actions that can be performed on a controller\n * Combines both standard CRUD operations and auth-specific operations\n */\nexport type ControllerActions =\n  | keyof PrismaQueryOptions<any>\n  | keyof Omit<AuthPrismaQueryOptions<any>, keyof PrismaQueryOptions<any>>;\n\n/**\n * Middleware to add Prisma query options to the request's query parameters.\n *\n * @template T - The type of the Prisma model.\n * @param {PrismaQueryOptions<T> | AuthPrismaQueryOptions<T>} prismaQueryOptions - The Prisma query options to attach.\n * @param {ControllerActions} action - The controller action to apply.\n * @returns A middleware function that attaches the query options to the request.\n */\nexport function addPrismaQueryOptionsToRequest<T extends Record<string, any>>(\n  prismaQueryOptions: PrismaQueryOptions<T> | AuthPrismaQueryOptions<T>,\n  action: ControllerActions\n) {\n  return (req: ArkosRequest, _: ArkosResponse, next: NextFunction) => {\n    const configs = getArkosConfig();\n\n    const resolvedOptions = resolvePrismaQueryOptions(\n      prismaQueryOptions,\n      action\n    );\n\n    const requestQueryOptions = configs?.request?.parameters\n      ?.allowDangerousPrismaQueryOptions\n      ? JSON.parse((req.query?.prismaQueryOptions as string) || \"{}\")\n      : {};\n\n    req.prismaQueryOptions = deepmerge(resolvedOptions, requestQueryOptions);\n\n    next();\n  };\n}\n\n/**\n * Logs request events with colored text such as errors, requests responses.\n *\n */\nexport function handleRequestLogs(\n  req: Request,\n  res: Response,\n  next: NextFunction\n) {\n  const startTime = Date.now();\n\n  const methodColors = {\n    GET: \"\\x1b[36m\", // Cyan\n    POST: \"\\x1b[32m\", // Green\n    PUT: \"\\x1b[33m\", // Orange/Yellow\n    PATCH: \"\\x1b[33m\", // Orange/Yellow\n    DELETE: \"\\x1b[31m\", // Red\n    HEAD: \"\\x1b[34m\", // Blue\n    OPTIONS: \"\\x1b[34m\", // Blue\n  };\n\n  const getStatusColor = (statusCode: number) => {\n    if (statusCode >= 200 && statusCode < 300) return \"\\x1b[32m\"; // Green\n    if (statusCode >= 300 && statusCode < 400) return \"\\x1b[33m\"; // Orange/Yellow\n    if (statusCode >= 400 && statusCode < 500) return \"\\x1b[33m\"; // Red\n    if (statusCode >= 500) return \"\\x1b[31m\"; // White on Red background\n    return \"\\x1b[0m\";\n  };\n\n  res.on(\"finish\", () => {\n    const duration = Date.now() - startTime;\n\n    const now = new Date();\n    const time = now.toTimeString().split(\" \")[0];\n\n    const methodColor =\n      methodColors[req.method as keyof typeof methodColors] || \"\\x1b[0m\";\n    const statusColor = getStatusColor(res.statusCode);\n\n    console.info(\n      `[\\x1b[36mInfo\\x1b[0m] \\x1b[90m${time}\\x1b[0m ${methodColor}${\n        req.method\n      }\\x1b[0m ${decodeURIComponent(req.originalUrl)} ${statusColor}${\n        res.statusCode\n      }\\x1b[0m \\x1b[35m${duration}ms\\x1b[0m`\n    );\n  });\n\n  next();\n}\n\nexport function handleRequestBodyValidationAndTransformation<T extends object>(\n  schemaOrDtoClass?: ClassConstructor<T>,\n  classValidatorValidationOptions?: ValidatorOptions\n): ArkosRequestHandler;\nexport function handleRequestBodyValidationAndTransformation<T extends object>(\n  schemaOrDtoClass?: ZodSchema<T>\n): ArkosRequestHandler;\nexport function handleRequestBodyValidationAndTransformation<T extends object>(\n  schemaOrDtoClass?: ZodSchema<T> | ClassConstructor<T>,\n  classValidatorValidationOptions?: ValidatorOptions\n) {\n  return catchAsync(\n    async (req: ArkosRequest, _: ArkosResponse, next: ArkosNextFunction) => {\n      const validationConfigs = getArkosConfig()?.validation;\n      let body = req.body;\n\n      if (validationConfigs?.resolver === \"class-validator\" && schemaOrDtoClass)\n        req.body = await validateDto(\n          schemaOrDtoClass as ClassConstructor<T>,\n          body,\n          deepmerge(\n            {\n              whitelist: true,\n              ...classValidatorValidationOptions,\n            },\n            validationConfigs?.validationOptions || {}\n          )\n        );\n      else if (validationConfigs?.resolver === \"zod\" && schemaOrDtoClass)\n        req.body = await validateSchema(schemaOrDtoClass as ZodSchema<T>, body);\n\n      next();\n    }\n  );\n}\n\nexport function validateRequestInputs(\n  validationRouteConfig: Pick<ArkosRouteConfig, \"validation\">\n) {\n  const arkosConfig = getArkosConfig();\n  const validationConfig = arkosConfig.validation;\n  const strictValidation = validationConfig?.strict;\n  const validators = validationRouteConfig?.validation;\n\n  if (!validationConfig?.resolver && validators)\n    throw Error(\n      \"Trying to pass validators into route config validation option without choosing a validation resolver under arkos.init({ validation: {} }).\"\n    );\n\n  const validatorFn: (validator: any, data: any) => Promise<any> =\n    validationConfig?.resolver == \"zod\" ? validateSchema : validateDto;\n  const validatorsKey: (\"body\" | \"query\" | \"params\")[] = [\n    \"body\",\n    \"query\",\n    \"params\",\n  ];\n\n  const isValidValidator =\n    validationConfig?.resolver == \"zod\" ? isZodSchema : isClass;\n  const validatorName =\n    validationConfig?.resolver == \"zod\" ? \"Zod Schema\" : \"Class-Validator Dto\";\n  const validatorNameType =\n    validationConfig?.resolver == \"zod\" ? \"Schema\" : \"Dto\";\n\n  if (validators)\n    validatorsKey.forEach((key) => {\n      if (strictValidation && !(key in validators))\n        throw Error(\n          `No { validation: { ${key}: ${validatorNameType} } } was found, while using strict validation you will need to pass undefined into ${key} in order to deny any request ${key} input.`\n        );\n\n      if (\n        key in validators &&\n        validators?.[key] !== undefined &&\n        !isValidValidator(validators[key])\n      )\n        throw Error(\n          `Please provide a valid ${validatorName} in order to use in { validation: { ${key}: ${validatorNameType} } }`\n        );\n    });\n\n  return catchAsync(\n    async (req: ArkosRequest, _: ArkosResponse, next: ArkosNextFunction) => {\n      for (const key of validatorsKey) {\n        const validator = validators?.[key];\n\n        if (strictValidation && !validator && Object.keys(req[key]).length > 0)\n          throw new AppError(\n            `No request ${key} is allowed on this route`,\n            400,\n            { [key]: req[key] },\n            `NoRequest${capitalize(key)}Allowed`\n          );\n\n        if (validator) req[key] = await validatorFn(validator, req[key]);\n      }\n\n      next();\n    }\n  );\n}\n"]}

package/dist/cjs/utils/arkos-router/index.js

@@ -35,23 +35,28 @@ function ArkosRouter() {
                         const method = prop;
                         route = config.route;
                         if (handlers.length > 0) {
+                            handlers = handlers.map((handler) => (0, error_handler_1.catchAsync)(handler, {
+                                type: handler.length > 3 ? "error" : "normal",
+                            }));
                             const finalHandler = handlers[handlers.length - 1];
                             route_config_registry_1.default.register(finalHandler, config, method);
                         }
                         const arkosConfig = (0, exports_1.getArkosConfig)();
                         const validationConfig = arkosConfig.validation;
                         const authenticationConfig = arkosConfig.authentication;
+                        if (validationConfig?.strict &&
+                            "validation" in config &&
+                            !config?.validation &&
+                            config?.validation !== undefined)
+                            throw Error("When using strict validation you must either pass { validation: false } in order to explicitly tell that no input will be received, or pass `undefined` for each input type e.g { validation: { query: undefined } } in order to deny the input of given request input.");
                         if (!validationConfig?.resolver && config.validation)
                             throw Error("Trying to pass validators into route config validation option without choosing a validation resolver under arkos.init({ validation: { resolver: '' } })");
                         if (!authenticationConfig?.mode && config.authentication)
                             throw Error("Trying to authenticate a route without choosing an authentication mode under arkos.init({ authentication: { mode: '' } })");
-                        handlers = [
-                            ...(0, helpers_1.getMiddlewareStack)(config),
-                            ...handlers.map((handler) => (0, error_handler_1.catchAsync)(handler, {
-                                type: handler.length > 3 ? "error" : "normal",
-                            })),
-                        ];
+                        handlers = [...(0, helpers_1.getMiddlewareStack)(config), ...handlers];
                     }
+                    else
+                        throw Error(`First argument of ArkosRouter().${prop}() must be a valid ArkosRouteConfig but recevied ${firstArg}`);
                     return originalMethod.call(target, route, ...handlers);
                 };
             }

package/dist/cjs/utils/arkos-router/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/utils/arkos-router/index.ts"],"names":[],"mappings":"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","sourcesContent":["import { Router } from \"express\";\nimport { IArkosRouter, ArkosRouteConfig } from \"./types\";\nimport { OpenAPIV3 } from \"openapi-types\";\nimport RouteConfigValidator from \"./route-config-validator\";\nimport RouteConfigRegistry from \"./route-config-registry\";\nimport { extractArkosRoutes, getMiddlewareStack } from \"./utils/helpers\";\nimport { getArkosConfig } from \"../../exports\";\nimport { catchAsync } from \"../../exports/error-handler\";\nimport { ArkosErrorRequestHandler, ArkosRequestHandler } from \"../../types\";\n\n/**\n * Creates an enhanced Express Router with features like OpenAPI documentation capabilities and smart data validation.\n *\n * The ArkosRouter extends the standard Express Router with the ability to\n * automatically capture OpenAPI metadata from route configurations.\n *\n * @example\n * const router = ArkosRouter();\n *\n * router.get(\n *   {\n *     route: \"/users/:id\",\n *     openapi: {\n *       summary: \"Get user by ID\",\n *       tags: [\"Users\"]\n *     }\n *   },\n *   (req, res) => { ... }\n * );\n *\n * @returns {IArkosRouter} A proxied Express Router instance with enhanced OpenAPI capabilities\n *\n * @see {@link ArkosRouteConfig} for configuration options\n */\nexport default function ArkosRouter(): IArkosRouter {\n  const router: IArkosRouter = Router();\n\n  return new Proxy(router, {\n    get(target, prop, receiver) {\n      const originalMethod = Reflect.get(target, prop, receiver);\n\n      const httpMethods = [\n        \"get\",\n        \"post\",\n        \"put\",\n        \"patch\",\n        \"delete\",\n        \"all\",\n        \"head\",\n        \"trace\",\n        \"options\",\n      ];\n\n      if (httpMethods.includes(prop as string)) {\n        return function (\n          firstArg: any,\n          ...handlers: (ArkosRequestHandler | ArkosErrorRequestHandler)[]\n        ) {\n          let route = firstArg;\n          if (RouteConfigValidator.isArkosRouteConfig(firstArg)) {\n            const config = firstArg as ArkosRouteConfig;\n            const method = prop as string;\n            route = config.route;\n\n            if (handlers.length > 0) {\n              const finalHandler = handlers[handlers.length - 1];\n              RouteConfigRegistry.register(finalHandler, config, method);\n            }\n\n            const arkosConfig = getArkosConfig();\n            const validationConfig = arkosConfig.validation;\n            const authenticationConfig = arkosConfig.authentication;\n\n            if (!validationConfig?.resolver && config.validation)\n              throw Error(\n                \"Trying to pass validators into route config validation option without choosing a validation resolver under arkos.init({ validation: { resolver: '' } })\"\n              );\n\n            if (!authenticationConfig?.mode && config.authentication)\n              throw Error(\n                \"Trying to authenticate a route without choosing an authentication mode under arkos.init({ authentication: { mode: '' } })\"\n              );\n\n            handlers = [\n              ...getMiddlewareStack(config),\n              ...handlers.map((handler) =>\n                catchAsync(handler, {\n                  type: handler.length > 3 ? \"error\" : \"normal\",\n                })\n              ),\n            ];\n          }\n\n          return originalMethod.call(target, route, ...handlers);\n        };\n      }\n      return originalMethod;\n    },\n  }) as IArkosRouter;\n}\n\nexport function generateOpenAPIFromApp(app: any) {\n  const routes = extractArkosRoutes(app);\n  const paths: Record<\n    string,\n    Record<string, Partial<OpenAPIV3.OperationObject>>\n  > = {};\n\n  routes.forEach(({ path, method, config }) => {\n    if (config?.openapi === false) return;\n\n    if (!paths[path]) paths[path] = {};\n\n    if (typeof config?.openapi === \"boolean\") {\n      config = {\n        ...config,\n        openapi: {},\n      };\n    }\n\n    const openapi =\n      typeof config?.openapi === \"object\" && config.openapi !== null\n        ? config.openapi\n        : {};\n\n    paths[path][method.toLowerCase()] = {\n      summary: openapi?.summary || `${method} ${path}`,\n      description: openapi?.description || `${method} ${path}`,\n      tags: openapi?.tags || [\"Others\"],\n      operationId: `${method}:${path}`,\n      ...openapi,\n    };\n  });\n\n  return paths;\n}\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/utils/arkos-router/index.ts"],"names":[],"mappings":"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","sourcesContent":["import { Router } from \"express\";\nimport { IArkosRouter, ArkosRouteConfig } from \"./types\";\nimport { OpenAPIV3 } from \"openapi-types\";\nimport RouteConfigValidator from \"./route-config-validator\";\nimport RouteConfigRegistry from \"./route-config-registry\";\nimport { extractArkosRoutes, getMiddlewareStack } from \"./utils/helpers\";\nimport { getArkosConfig } from \"../../exports\";\nimport { catchAsync } from \"../../exports/error-handler\";\nimport { ArkosErrorRequestHandler, ArkosRequestHandler } from \"../../types\";\n\n/**\n * Creates an enhanced Express Router with features like OpenAPI documentation capabilities and smart data validation.\n *\n * The ArkosRouter extends the standard Express Router with the ability to\n * automatically capture OpenAPI metadata from route configurations.\n *\n * @example\n * const router = ArkosRouter();\n *\n * router.get(\n *   {\n *     route: \"/users/:id\",\n *     openapi: {\n *       summary: \"Get user by ID\",\n *       tags: [\"Users\"]\n *     }\n *   },\n *   (req, res) => { ... }\n * );\n *\n * @returns {IArkosRouter} A proxied Express Router instance with enhanced OpenAPI capabilities\n *\n * @see {@link ArkosRouteConfig} for configuration options\n */\nexport default function ArkosRouter(): IArkosRouter {\n  const router: IArkosRouter = Router();\n\n  return new Proxy(router, {\n    get(target, prop, receiver) {\n      const originalMethod = Reflect.get(target, prop, receiver);\n\n      const httpMethods = [\n        \"get\",\n        \"post\",\n        \"put\",\n        \"patch\",\n        \"delete\",\n        \"all\",\n        \"head\",\n        \"trace\",\n        \"options\",\n      ];\n\n      if (httpMethods.includes(prop as string)) {\n        return function (\n          firstArg: any,\n          ...handlers: (ArkosRequestHandler | ArkosErrorRequestHandler)[]\n        ) {\n          let route = firstArg;\n          if (RouteConfigValidator.isArkosRouteConfig(firstArg)) {\n            const config = firstArg as ArkosRouteConfig;\n            const method = prop as string;\n            route = config.route;\n\n            if (handlers.length > 0) {\n              handlers = handlers.map((handler) =>\n                catchAsync(handler, {\n                  type: handler.length > 3 ? \"error\" : \"normal\",\n                })\n              );\n\n              const finalHandler = handlers[handlers.length - 1];\n              RouteConfigRegistry.register(finalHandler, config, method);\n            }\n\n            const arkosConfig = getArkosConfig();\n            const validationConfig = arkosConfig.validation;\n            const authenticationConfig = arkosConfig.authentication;\n\n            if (\n              validationConfig?.strict &&\n              \"validation\" in config &&\n              !config?.validation &&\n              config?.validation !== undefined\n            )\n              throw Error(\n                \"When using strict validation you must either pass { validation: false } in order to explicitly tell that no input will be received, or pass `undefined` for each input type e.g { validation: { query: undefined } } in order to deny the input of given request input.\"\n              );\n\n            if (!validationConfig?.resolver && config.validation)\n              throw Error(\n                \"Trying to pass validators into route config validation option without choosing a validation resolver under arkos.init({ validation: { resolver: '' } })\"\n              );\n\n            if (!authenticationConfig?.mode && config.authentication)\n              throw Error(\n                \"Trying to authenticate a route without choosing an authentication mode under arkos.init({ authentication: { mode: '' } })\"\n              );\n\n            handlers = [...getMiddlewareStack(config), ...handlers];\n          } else\n            throw Error(\n              `First argument of ArkosRouter().${prop as string}() must be a valid ArkosRouteConfig but recevied ${firstArg}`\n            );\n\n          return originalMethod.call(target, route, ...handlers);\n        };\n      }\n      return originalMethod;\n    },\n  }) as IArkosRouter;\n}\n\nexport function generateOpenAPIFromApp(app: any) {\n  const routes = extractArkosRoutes(app);\n  const paths: Record<\n    string,\n    Record<string, Partial<OpenAPIV3.OperationObject>>\n  > = {};\n\n  routes.forEach(({ path, method, config }) => {\n    if (config?.openapi === false) return;\n\n    if (!paths[path]) paths[path] = {};\n\n    if (typeof config?.openapi === \"boolean\") {\n      config = {\n        ...config,\n        openapi: {},\n      };\n    }\n\n    const openapi =\n      typeof config?.openapi === \"object\" && config.openapi !== null\n        ? config.openapi\n        : {};\n\n    paths[path][method.toLowerCase()] = {\n      summary: openapi?.summary || `${method} ${path}`,\n      description: openapi?.description || `${method} ${path}`,\n      tags: openapi?.tags || [\"Others\"],\n      operationId: `${method}:${path}`,\n      ...openapi,\n    };\n  });\n\n  return paths;\n}\n"]}

package/dist/cjs/utils/arkos-router/types/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/utils/arkos-router/types/index.ts"],"names":[],"mappings":"","sourcesContent":["import { ErrorRequestHandler, IRouter, RequestHandler } from \"express\";\nimport { OpenAPIV3 } from \"openapi-types\";\nimport { ZodSchema } from \"zod\";\n\ntype MethodHandler = (\n  configOrPath: string | ArkosRouteConfig,\n  ...handlers: (RequestHandler | ErrorRequestHandler)[]\n) => IArkosRouter;\n\nexport interface IArkosRouter\n  extends Omit<\n    IRouter,\n    | \"get\"\n    | \"post\"\n    | \"put\"\n    | \"patch\"\n    | \"delete\"\n    | \"options\"\n    | \"head\"\n    | \"trace\"\n    | \"all\"\n  > {\n  get: MethodHandler;\n  post: MethodHandler;\n  put: MethodHandler;\n  patch: MethodHandler;\n  delete: MethodHandler;\n  options: MethodHandler;\n  head: MethodHandler;\n  trace: MethodHandler;\n  all: MethodHandler;\n}\n\nexport interface ArkosRouteConfig {\n  route: string;\n  authentication?:\n    | boolean\n    | {\n        resource: string;\n        action: string;\n        rule?: any;\n      };\n  validation?: {\n    query?: ZodSchema | (new (...args: any[]) => object) | undefined;\n    body?: ZodSchema | (new (...args: any[]) => object) | undefined;\n    params?: ZodSchema | (new (...args: any[]) => object) | undefined;\n  };\n  openapi?: boolean | Partial<OpenAPIV3.OperationObject>;\n}\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/utils/arkos-router/types/index.ts"],"names":[],"mappings":"","sourcesContent":["import { ErrorRequestHandler, IRouter, RequestHandler } from \"express\";\nimport { OpenAPIV3 } from \"openapi-types\";\nimport { ZodSchema } from \"zod\";\n\ntype MethodHandler = (\n  configOrPath: ArkosRouteConfig,\n  ...handlers: (RequestHandler | ErrorRequestHandler)[]\n) => IArkosRouter;\n\nexport interface IArkosRouter\n  extends Omit<\n    IRouter,\n    | \"get\"\n    | \"post\"\n    | \"put\"\n    | \"patch\"\n    | \"delete\"\n    | \"options\"\n    | \"head\"\n    | \"trace\"\n    | \"all\"\n  > {\n  get: MethodHandler;\n  post: MethodHandler;\n  put: MethodHandler;\n  patch: MethodHandler;\n  delete: MethodHandler;\n  options: MethodHandler;\n  head: MethodHandler;\n  trace: MethodHandler;\n  all: MethodHandler;\n}\n\nexport interface ArkosRouteConfig {\n  route: string;\n  authentication?:\n    | boolean\n    | {\n        resource: string;\n        action: string;\n        rule?: any;\n      };\n  validation?:\n    | undefined\n    | {\n        query?: ZodSchema | (new (...args: any[]) => object) | undefined;\n        body?: ZodSchema | (new (...args: any[]) => object) | undefined;\n        params?: ZodSchema | (new (...args: any[]) => object) | undefined;\n      };\n  openapi?: boolean | Partial<OpenAPIV3.OperationObject>;\n}\n"]}

package/dist/cjs/utils/arkos-router/utils/helpers/index.js

@@ -64,8 +64,7 @@ function getMiddlewareStack(config) {
         middlewares.push(services_1.authService.handleAccessControl(config.authentication.action, config.authentication.resource, {
             [config.authentication.action]: config.authentication?.rule,
         }));
-    if (typeof config?.validation === "object" && config?.validation)
-        middlewares.push((0, base_middlewares_1.validateRequestInputs)(config.validation));
+    middlewares.push((0, base_middlewares_1.validateRequestInputs)(config));
     return middlewares;
 }
 //# sourceMappingURL=index.js.map

package/dist/cjs/utils/arkos-router/utils/helpers/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/utils/arkos-router/utils/helpers/index.ts"],"names":[],"mappings":"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","sourcesContent":["import { authService } from \"../../../../exports/services\";\nimport { validateRequestInputs } from \"../../../../modules/base/base.middlewares\";\nimport RouteConfigRegistry from \"../../route-config-registry\";\nimport { ArkosRouteConfig } from \"../../types\";\n\nexport function extractArkosRoutes(\n  app: any,\n  basePath = \"\"\n): Array<{\n  path: string;\n  method: string;\n  config?: ArkosRouteConfig;\n}> {\n  const routes: Array<{\n    path: string;\n    method: string;\n    config?: ArkosRouteConfig;\n  }> = [];\n\n  function extractFromStack(stack: any[], prefix = \"\") {\n    stack.forEach((layer: any) => {\n      if (layer.route) {\n        const fullPath = prefix + layer.route.path;\n        const methods = Object.keys(layer.route.methods);\n\n        methods.forEach((method) => {\n          const handlers = layer.route.stack || [];\n          let config: ArkosRouteConfig | undefined;\n\n          for (const handler of handlers) {\n            const foundConfig = RouteConfigRegistry.get(handler.handle);\n\n            if (foundConfig) {\n              config = foundConfig;\n              routes.push({\n                path: fullPath,\n                method: method.toUpperCase(),\n                config,\n              });\n\n              break;\n            }\n          }\n        });\n      } else if (layer.name === \"router\" && layer.handle?.stack) {\n        let nestedPrefix = prefix;\n\n        if (layer.regexp) {\n          const match = layer.regexp\n            .toString()\n            .match(/\\/\\^?(\\\\\\/[^?]+|\\/[^?]+)/);\n          if (match) {\n            nestedPrefix = prefix + \"/\" + match[1].replace(/\\\\\\//g, \"/\");\n            nestedPrefix = nestedPrefix\n              .replace(/\\/\\//g, \"/\")\n              .replace(/\\/$/, \"\");\n          }\n        }\n\n        extractFromStack(layer.handle.stack, nestedPrefix);\n      }\n    });\n  }\n\n  const stack = app._router?.stack || app.stack;\n  if (stack) extractFromStack(stack, basePath);\n\n  return routes;\n}\n\nexport function getMiddlewareStack(config: ArkosRouteConfig) {\n  const middlewares = [];\n  if (config.authentication) middlewares.push(authService.authenticate);\n  if (\n    typeof config.authentication === \"object\" &&\n    config.authentication.action &&\n    config.authentication.resource\n  )\n    middlewares.push(\n      authService.handleAccessControl(\n        config.authentication.action,\n        config.authentication.resource,\n        {\n          [config.authentication.action]: config.authentication?.rule,\n        }\n      )\n    );\n\n  if (typeof config?.validation === \"object\" && config?.validation)\n    middlewares.push(validateRequestInputs(config.validation));\n\n  return middlewares;\n}\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/utils/arkos-router/utils/helpers/index.ts"],"names":[],"mappings":"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","sourcesContent":["import { authService } from \"../../../../exports/services\";\nimport { validateRequestInputs } from \"../../../../modules/base/base.middlewares\";\nimport RouteConfigRegistry from \"../../route-config-registry\";\nimport { ArkosRouteConfig } from \"../../types\";\n\nexport function extractArkosRoutes(\n  app: any,\n  basePath = \"\"\n): Array<{\n  path: string;\n  method: string;\n  config?: ArkosRouteConfig;\n}> {\n  const routes: Array<{\n    path: string;\n    method: string;\n    config?: ArkosRouteConfig;\n  }> = [];\n\n  function extractFromStack(stack: any[], prefix = \"\") {\n    stack.forEach((layer: any) => {\n      if (layer.route) {\n        const fullPath = prefix + layer.route.path;\n        const methods = Object.keys(layer.route.methods);\n\n        methods.forEach((method) => {\n          const handlers = layer.route.stack || [];\n          let config: ArkosRouteConfig | undefined;\n\n          for (const handler of handlers) {\n            const foundConfig = RouteConfigRegistry.get(handler.handle);\n\n            if (foundConfig) {\n              config = foundConfig;\n              routes.push({\n                path: fullPath,\n                method: method.toUpperCase(),\n                config,\n              });\n\n              break;\n            }\n          }\n        });\n      } else if (layer.name === \"router\" && layer.handle?.stack) {\n        let nestedPrefix = prefix;\n\n        if (layer.regexp) {\n          const match = layer.regexp\n            .toString()\n            .match(/\\/\\^?(\\\\\\/[^?]+|\\/[^?]+)/);\n          if (match) {\n            nestedPrefix = prefix + \"/\" + match[1].replace(/\\\\\\//g, \"/\");\n            nestedPrefix = nestedPrefix\n              .replace(/\\/\\//g, \"/\")\n              .replace(/\\/$/, \"\");\n          }\n        }\n\n        extractFromStack(layer.handle.stack, nestedPrefix);\n      }\n    });\n  }\n\n  const stack = app._router?.stack || app.stack;\n  if (stack) extractFromStack(stack, basePath);\n\n  return routes;\n}\n\nexport function getMiddlewareStack(config: ArkosRouteConfig) {\n  const middlewares = [];\n  if (config.authentication) middlewares.push(authService.authenticate);\n  if (\n    typeof config.authentication === \"object\" &&\n    config.authentication.action &&\n    config.authentication.resource\n  )\n    middlewares.push(\n      authService.handleAccessControl(\n        config.authentication.action,\n        config.authentication.resource,\n        {\n          [config.authentication.action]: config.authentication?.rule,\n        }\n      )\n    );\n\n  middlewares.push(validateRequestInputs(config));\n\n  return middlewares;\n}\n"]}

package/dist/cjs/utils/cli/utils/cli.helpers.js

@@ -19,6 +19,6 @@ function killServerChildProcess() {
     (0, start_1.killProductionServerChildProcess)();
 }
 function getVersion() {
-    return "1.4.0-canary.6";
+    return "1.4.0-canary.7";
 }
 //# sourceMappingURL=cli.helpers.js.map

package/dist/cjs/utils/cli/utils/template-generator/templates/router-template.js

@@ -17,21 +17,22 @@ function generateRouterTemplate(options) {
         : `import ${modelName.camel}Controller from "${imports?.controller ||
             `./${modelName.kebab}.controller${ext === "js" ? "." + "js" : ""}`}"`;
     const controllerHandlerLine = `${modelName.camel}Controller.someHandler`;
-    return `import { Router } from 'express'
-import { authService } from 'arkos/services'
-import { catchAsync } from 'arkos/error-handler'
+    return `import { ArkosRouter } from 'arkos'
 ${controllerImportLine}
 ${routerConfigTsTypeImport}
 
 export const config${routerConfigTsType} = { }
 
-const ${modelName.camel}Router = Router()
+const ${modelName.camel}Router = ArkosRouter()
 
 ${modelName.camel}Router.get(
-  '/custom-endpoint',
-  authService.authenticate,
-  authService.handleAccessControl('CustomAction', '${modelName.kebab}'),
-  catchAsync(${controllerHandlerLine})
+  {
+    route: "/custom-endpoint",
+    authentication: { action: "CustomAction", resource: "${modelName.kebab}" },
+    validation: {},
+    openapi: {}
+  },
+  ${controllerHandlerLine}
 )
 
 export default ${modelName.camel}Router

package/dist/cjs/utils/cli/utils/template-generator/templates/router-template.js.map

@@ -1 +1 @@
-{"version":3,"file":"router-template.js","sourceRoot":"","sources":["../../../../../../../src/utils/cli/utils/template-generator/templates/router-template.ts"],"names":[],"mappings":";;AAMA,wDA+CC;AArDD,+DAGwC;AAGxC,SAAgB,sBAAsB,CAAC,OAAwB;IAC7D,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAEvC,IAAI,CAAC,SAAS;QACZ,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;IAEjE,MAAM,GAAG,GAAG,IAAA,iCAAoB,GAAE,CAAC;IACnC,MAAM,cAAc,GAClB,OAAO,EAAE,UAAU,IAAI,KAAK,SAAS,CAAC,KAAK,eAAe,GAAG,EAAE,CAAC;IAElE,MAAM,kBAAkB,GAAG,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC;IAChE,MAAM,wBAAwB,GAC5B,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,sCAAsC,CAAC,CAAC,CAAC,EAAE,CAAC;IAE7D,MAAM,gBAAgB,GAAG,IAAA,4BAAe,EAAC,cAAc,CAAC,CAAC;IAEzD,MAAM,oBAAoB,GAAG,gBAAgB;QAC3C,CAAC,CAAC,UAAU,SAAS,CAAC,KAAK,oBACvB,OAAO,EAAE,UAAU;YACnB,KAAK,SAAS,CAAC,KAAK,cAAc,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,EAClE,GAAG;QACL,CAAC,CAAC,UAAU,SAAS,CAAC,KAAK,oBACvB,OAAO,EAAE,UAAU;YACnB,KAAK,SAAS,CAAC,KAAK,cAAc,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,EAClE,GAAG,CAAC;IAER,MAAM,qBAAqB,GAAG,GAAG,SAAS,CAAC,KAAK,wBAAwB,CAAC;IAEzE,OAAO;;;EAGP,oBAAoB;EACpB,wBAAwB;;qBAEL,kBAAkB;;QAE/B,SAAS,CAAC,KAAK;;EAErB,SAAS,CAAC,KAAK;;;qDAGoC,SAAS,CAAC,KAAK;eACrD,qBAAqB;;;iBAGnB,SAAS,CAAC,KAAK;CAC/B,CAAC;AACF,CAAC","sourcesContent":["import {\n  checkFileExists,\n  getUserFileExtension,\n} from \"../../../../helpers/fs.helpers\";\nimport { TemplateOptions } from \"../../template-generators\";\n\nexport function generateRouterTemplate(options: TemplateOptions): string {\n  const { modelName, imports } = options;\n\n  if (!modelName)\n    throw new Error(\"Module name is required for router template\");\n\n  const ext = getUserFileExtension();\n  const controllerPath =\n    imports?.controller || `./${modelName.kebab}.controller.${ext}`;\n\n  const routerConfigTsType = ext === \"ts\" ? \": RouterConfig\" : \"\";\n  const routerConfigTsTypeImport =\n    ext === \"ts\" ? \"import { RouterConfig } from 'arkos'\" : \"\";\n\n  const controllerExists = checkFileExists(controllerPath);\n\n  const controllerImportLine = controllerExists\n    ? `import ${modelName.camel}Controller from \"${\n        imports?.controller ||\n        `./${modelName.kebab}.controller${ext === \"js\" ? \".\" + \"js\" : \"\"}`\n      }\"`\n    : `import ${modelName.camel}Controller from \"${\n        imports?.controller ||\n        `./${modelName.kebab}.controller${ext === \"js\" ? \".\" + \"js\" : \"\"}`\n      }\"`;\n\n  const controllerHandlerLine = `${modelName.camel}Controller.someHandler`;\n\n  return `import { Router } from 'express'\nimport { authService } from 'arkos/services'\nimport { catchAsync } from 'arkos/error-handler'\n${controllerImportLine}\n${routerConfigTsTypeImport}\n\nexport const config${routerConfigTsType} = { }\n\nconst ${modelName.camel}Router = Router()\n\n${modelName.camel}Router.get(\n  '/custom-endpoint',\n  authService.authenticate,\n  authService.handleAccessControl('CustomAction', '${modelName.kebab}'),\n  catchAsync(${controllerHandlerLine})\n)\n\nexport default ${modelName.camel}Router\n`;\n}\n"]}
+{"version":3,"file":"router-template.js","sourceRoot":"","sources":["../../../../../../../src/utils/cli/utils/template-generator/templates/router-template.ts"],"names":[],"mappings":";;AAMA,wDAgDC;AAtDD,+DAGwC;AAGxC,SAAgB,sBAAsB,CAAC,OAAwB;IAC7D,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAEvC,IAAI,CAAC,SAAS;QACZ,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;IAEjE,MAAM,GAAG,GAAG,IAAA,iCAAoB,GAAE,CAAC;IACnC,MAAM,cAAc,GAClB,OAAO,EAAE,UAAU,IAAI,KAAK,SAAS,CAAC,KAAK,eAAe,GAAG,EAAE,CAAC;IAElE,MAAM,kBAAkB,GAAG,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC;IAChE,MAAM,wBAAwB,GAC5B,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,sCAAsC,CAAC,CAAC,CAAC,EAAE,CAAC;IAE7D,MAAM,gBAAgB,GAAG,IAAA,4BAAe,EAAC,cAAc,CAAC,CAAC;IAEzD,MAAM,oBAAoB,GAAG,gBAAgB;QAC3C,CAAC,CAAC,UAAU,SAAS,CAAC,KAAK,oBACvB,OAAO,EAAE,UAAU;YACnB,KAAK,SAAS,CAAC,KAAK,cAAc,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,EAClE,GAAG;QACL,CAAC,CAAC,UAAU,SAAS,CAAC,KAAK,oBACvB,OAAO,EAAE,UAAU;YACnB,KAAK,SAAS,CAAC,KAAK,cAAc,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,EAClE,GAAG,CAAC;IAER,MAAM,qBAAqB,GAAG,GAAG,SAAS,CAAC,KAAK,wBAAwB,CAAC;IAEzE,OAAO;EACP,oBAAoB;EACpB,wBAAwB;;qBAEL,kBAAkB;;QAE/B,SAAS,CAAC,KAAK;;EAErB,SAAS,CAAC,KAAK;;;2DAG0C,SAAS,CAAC,KAAK;;;;IAItE,qBAAqB;;;iBAGR,SAAS,CAAC,KAAK;CAC/B,CAAC;AACF,CAAC","sourcesContent":["import {\n  checkFileExists,\n  getUserFileExtension,\n} from \"../../../../helpers/fs.helpers\";\nimport { TemplateOptions } from \"../../template-generators\";\n\nexport function generateRouterTemplate(options: TemplateOptions): string {\n  const { modelName, imports } = options;\n\n  if (!modelName)\n    throw new Error(\"Module name is required for router template\");\n\n  const ext = getUserFileExtension();\n  const controllerPath =\n    imports?.controller || `./${modelName.kebab}.controller.${ext}`;\n\n  const routerConfigTsType = ext === \"ts\" ? \": RouterConfig\" : \"\";\n  const routerConfigTsTypeImport =\n    ext === \"ts\" ? \"import { RouterConfig } from 'arkos'\" : \"\";\n\n  const controllerExists = checkFileExists(controllerPath);\n\n  const controllerImportLine = controllerExists\n    ? `import ${modelName.camel}Controller from \"${\n        imports?.controller ||\n        `./${modelName.kebab}.controller${ext === \"js\" ? \".\" + \"js\" : \"\"}`\n      }\"`\n    : `import ${modelName.camel}Controller from \"${\n        imports?.controller ||\n        `./${modelName.kebab}.controller${ext === \"js\" ? \".\" + \"js\" : \"\"}`\n      }\"`;\n\n  const controllerHandlerLine = `${modelName.camel}Controller.someHandler`;\n\n  return `import { ArkosRouter } from 'arkos'\n${controllerImportLine}\n${routerConfigTsTypeImport}\n\nexport const config${routerConfigTsType} = { }\n\nconst ${modelName.camel}Router = ArkosRouter()\n\n${modelName.camel}Router.get(\n  {\n    route: \"/custom-endpoint\",\n    authentication: { action: \"CustomAction\", resource: \"${modelName.kebab}\" },\n    validation: {},\n    openapi: {}\n  },\n  ${controllerHandlerLine}\n)\n\nexport default ${modelName.camel}Router\n`;\n}\n"]}

package/dist/esm/exports/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/exports/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AACpD,OAAO,WAAW,MAAM,uBAAuB,CAAC;AAehD,MAAM,KAAK,GAAG;IACZ,IAAI,EAAE,OAAO;CACd,CAAC;AAEF,OAAO,EAKL,cAAc,EAGd,cAAc,EAyBd,WAAW,GACZ,CAAC;AAOF,eAAe,KAAK,CAAC","sourcesContent":["import { RouterConfig } from \"../types/router-config\";\nimport { BaseController } from \"./../modules/base/base.controller\";\nimport { initApp, getArkosConfig } from \"../server\";\nimport ArkosRouter from \"../utils/arkos-router\";\nimport {\n  ArkosRequest,\n  ArkosResponse,\n  ArkosNextFunction,\n  ArkosRequestHandler,\n} from \"../types\";\nimport { ArkosConfig } from \"../types/arkos-config\";\n\n/**\n * Initializes the Arkos application.\n *\n * @module arkos\n * @property {Function} init - Function to initialize the app.\n */\nconst arkos = {\n  init: initApp,\n};\n\nexport {\n  ArkosRequest,\n  ArkosResponse,\n  ArkosNextFunction,\n  ArkosRequestHandler,\n  BaseController,\n  ArkosConfig,\n  RouterConfig,\n  getArkosConfig,\n  /**\n   * Creates an enhanced Express Router with features like OpenAPI documentation capabilities and smart data validation.\n   *\n   * The ArkosRouter extends the standard Express Router with the ability to\n   * automatically capture OpenAPI metadata from route configurations.\n   *\n   * @example\n   * const router = ArkosRouter();\n   *\n   * router.get(\n   *   {\n   *     route: \"/users/:id\",\n   *     openapi: {\n   *       summary: \"Get user by ID\",\n   *       tags: [\"Users\"]\n   *     }\n   *   },\n   *   (req, res) => { ... }\n   * );\n   *\n   * @returns {IArkosRouter} A proxied Express Router instance with enhanced OpenAPI capabilities\n   *\n   * @see {@link ArkosRouteConfig} for configuration options\n   */\n  ArkosRouter,\n};\n\n/**\n * Main entry point for the Arkos module.\n *\n * @module arkos\n */\nexport default arkos;\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/exports/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AACpD,OAAO,WAAW,MAAM,uBAAuB,CAAC;AAgBhD,MAAM,KAAK,GAAG;IACZ,IAAI,EAAE,OAAO;CACd,CAAC;AAEF,OAAO,EAKL,cAAc,EAGd,cAAc,EAyBd,WAAW,GAEZ,CAAC;AAOF,eAAe,KAAK,CAAC","sourcesContent":["import { RouterConfig } from \"../types/router-config\";\nimport { BaseController } from \"./../modules/base/base.controller\";\nimport { initApp, getArkosConfig } from \"../server\";\nimport ArkosRouter from \"../utils/arkos-router\";\nimport { ArkosRouteConfig } from \"../utils/arkos-router/types\";\nimport {\n  ArkosRequest,\n  ArkosResponse,\n  ArkosNextFunction,\n  ArkosRequestHandler,\n} from \"../types\";\nimport { ArkosConfig } from \"../types/arkos-config\";\n\n/**\n * Initializes the Arkos application.\n *\n * @module arkos\n * @property {Function} init - Function to initialize the app.\n */\nconst arkos = {\n  init: initApp,\n};\n\nexport {\n  ArkosRequest,\n  ArkosResponse,\n  ArkosNextFunction,\n  ArkosRequestHandler,\n  BaseController,\n  ArkosConfig,\n  RouterConfig,\n  getArkosConfig,\n  /**\n   * Creates an enhanced Express Router with features like OpenAPI documentation capabilities and smart data validation.\n   *\n   * The ArkosRouter extends the standard Express Router with the ability to\n   * automatically capture OpenAPI metadata from route configurations.\n   *\n   * @example\n   * const router = ArkosRouter();\n   *\n   * router.get(\n   *   {\n   *     route: \"/users/:id\",\n   *     openapi: {\n   *       summary: \"Get user by ID\",\n   *       tags: [\"Users\"]\n   *     }\n   *   },\n   *   (req, res) => { ... }\n   * );\n   *\n   * @returns {IArkosRouter} A proxied Express Router instance with enhanced OpenAPI capabilities\n   *\n   * @see {@link ArkosRouteConfig} for configuration options\n   */\n  ArkosRouter,\n  ArkosRouteConfig,\n};\n\n/**\n * Main entry point for the Arkos module.\n *\n * @module arkos\n */\nexport default arkos;\n"]}

package/dist/esm/modules/base/base.middlewares.js

@@ -80,14 +80,13 @@ export function handleRequestBodyValidationAndTransformation(schemaOrDtoClass, c
         next();
     });
 }
-export function validateRequestInputs(validators) {
+export function validateRequestInputs(validationRouteConfig) {
     const arkosConfig = getArkosConfig();
     const validationConfig = arkosConfig.validation;
     const strictValidation = validationConfig?.strict;
+    const validators = validationRouteConfig?.validation;
     if (!validationConfig?.resolver && validators)
         throw Error("Trying to pass validators into route config validation option without choosing a validation resolver under arkos.init({ validation: {} }).");
-    if (strictValidation && !validators && validators !== false)
-        throw Error("When using strict validation you must either pass { validation: false } in order to explicitly tell that no input will be received, or pass `undefined` for each input type e.g { validation: { query: undefined } } in order to deny the input of given request input.");
     const validatorFn = validationConfig?.resolver == "zod" ? validateSchema : validateDto;
     const validatorsKey = [
         "body",
@@ -104,7 +103,7 @@ export function validateRequestInputs(validators) {
             if (key in validators &&
                 validators?.[key] !== undefined &&
                 !isValidValidator(validators[key]))
-                throw Error(`Please pass a valid ${validatorName} in order to use in { validation: { ${key}: ${validatorNameType} } }`);
+                throw Error(`Please provide a valid ${validatorName} in order to use in { validation: { ${key}: ${validatorNameType} } }`);
         });
     return catchAsync(async (req, _, next) => {
         for (const key of validatorsKey) {

package/dist/esm/modules/base/base.middlewares.js.map

@@ -1 +1 @@
-{"version":3,"file":"base.middlewares.js","sourceRoot":"","sources":["../../../../src/modules/base/base.middlewares.ts"],"names":[],"mappings":"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","sourcesContent":["import { NextFunction, Request, Response } from \"express\";\nimport {\n  PrismaQueryOptions,\n  ArkosNextFunction,\n  ArkosRequest,\n  ArkosRequestHandler,\n  ArkosResponse,\n  AuthPrismaQueryOptions,\n} from \"../../types\";\nimport { getArkosConfig } from \"../../server\";\nimport deepmerge from \"../../utils/helpers/deepmerge.helper\";\nimport { AppError, catchAsync } from \"../../exports/error-handler\";\nimport validateDto from \"../../utils/validate-dto\";\nimport validateSchema from \"../../utils/validate-schema\";\nimport { ZodSchema } from \"zod\";\nimport { ClassConstructor } from \"class-transformer\";\nimport { ValidatorOptions } from \"class-validator\";\nimport { resolvePrismaQueryOptions } from \"./utils/helpers/base.middlewares.helpers\";\nimport { ArkosRouteConfig } from \"../../utils/arkos-router/types\";\nimport { capitalize } from \"../../utils/helpers/text.helpers\";\nimport { isClass, isZodSchema } from \"../../utils/dynamic-loader\";\n\nexport function callNext(_: Request, _1: Response, next: NextFunction) {\n  next();\n}\n\nexport function sendResponse(req: ArkosRequest, res: ArkosResponse) {\n  if (Number(req?.responseStatus) === 204)\n    res.status(Number(req?.responseStatus)).send();\n  else if (req.responseData && req?.responseStatus)\n    res.status(Number(req?.responseStatus)).json(req.responseData);\n  else if (Number(req?.responseStatus) && !req.responseData)\n    res.status(Number(req?.responseStatus)).send();\n  else\n    res\n      .status(500)\n      .json({ message: \"No status or data attached to the response\" });\n}\n\nexport function addRouteMiddlwaresAndConfigs() {}\n\n/**\n * Type representing all possible actions that can be performed on a controller\n * Combines both standard CRUD operations and auth-specific operations\n */\nexport type ControllerActions =\n  | keyof PrismaQueryOptions<any>\n  | keyof Omit<AuthPrismaQueryOptions<any>, keyof PrismaQueryOptions<any>>;\n\n/**\n * Middleware to add Prisma query options to the request's query parameters.\n *\n * @template T - The type of the Prisma model.\n * @param {PrismaQueryOptions<T> | AuthPrismaQueryOptions<T>} prismaQueryOptions - The Prisma query options to attach.\n * @param {ControllerActions} action - The controller action to apply.\n * @returns A middleware function that attaches the query options to the request.\n */\nexport function addPrismaQueryOptionsToRequest<T extends Record<string, any>>(\n  prismaQueryOptions: PrismaQueryOptions<T> | AuthPrismaQueryOptions<T>,\n  action: ControllerActions\n) {\n  return (req: ArkosRequest, _: ArkosResponse, next: NextFunction) => {\n    const configs = getArkosConfig();\n\n    const resolvedOptions = resolvePrismaQueryOptions(\n      prismaQueryOptions,\n      action\n    );\n\n    const requestQueryOptions = configs?.request?.parameters\n      ?.allowDangerousPrismaQueryOptions\n      ? JSON.parse((req.query?.prismaQueryOptions as string) || \"{}\")\n      : {};\n\n    req.prismaQueryOptions = deepmerge(resolvedOptions, requestQueryOptions);\n\n    next();\n  };\n}\n\n/**\n * Logs request events with colored text such as errors, requests responses.\n *\n */\nexport function handleRequestLogs(\n  req: Request,\n  res: Response,\n  next: NextFunction\n) {\n  const startTime = Date.now();\n\n  const methodColors = {\n    GET: \"\\x1b[36m\", // Cyan\n    POST: \"\\x1b[32m\", // Green\n    PUT: \"\\x1b[33m\", // Orange/Yellow\n    PATCH: \"\\x1b[33m\", // Orange/Yellow\n    DELETE: \"\\x1b[31m\", // Red\n    HEAD: \"\\x1b[34m\", // Blue\n    OPTIONS: \"\\x1b[34m\", // Blue\n  };\n\n  const getStatusColor = (statusCode: number) => {\n    if (statusCode >= 200 && statusCode < 300) return \"\\x1b[32m\"; // Green\n    if (statusCode >= 300 && statusCode < 400) return \"\\x1b[33m\"; // Orange/Yellow\n    if (statusCode >= 400 && statusCode < 500) return \"\\x1b[33m\"; // Red\n    if (statusCode >= 500) return \"\\x1b[31m\"; // White on Red background\n    return \"\\x1b[0m\";\n  };\n\n  res.on(\"finish\", () => {\n    const duration = Date.now() - startTime;\n\n    const now = new Date();\n    const time = now.toTimeString().split(\" \")[0];\n\n    const methodColor =\n      methodColors[req.method as keyof typeof methodColors] || \"\\x1b[0m\";\n    const statusColor = getStatusColor(res.statusCode);\n\n    console.info(\n      `[\\x1b[36mInfo\\x1b[0m] \\x1b[90m${time}\\x1b[0m ${methodColor}${\n        req.method\n      }\\x1b[0m ${decodeURIComponent(req.originalUrl)} ${statusColor}${\n        res.statusCode\n      }\\x1b[0m \\x1b[35m${duration}ms\\x1b[0m`\n    );\n  });\n\n  next();\n}\n\nexport function handleRequestBodyValidationAndTransformation<T extends object>(\n  schemaOrDtoClass?: ClassConstructor<T>,\n  classValidatorValidationOptions?: ValidatorOptions\n): ArkosRequestHandler;\nexport function handleRequestBodyValidationAndTransformation<T extends object>(\n  schemaOrDtoClass?: ZodSchema<T>\n): ArkosRequestHandler;\nexport function handleRequestBodyValidationAndTransformation<T extends object>(\n  schemaOrDtoClass?: ZodSchema<T> | ClassConstructor<T>,\n  classValidatorValidationOptions?: ValidatorOptions\n) {\n  return catchAsync(\n    async (req: ArkosRequest, _: ArkosResponse, next: ArkosNextFunction) => {\n      const validationConfigs = getArkosConfig()?.validation;\n      let body = req.body;\n\n      if (validationConfigs?.resolver === \"class-validator\" && schemaOrDtoClass)\n        req.body = await validateDto(\n          schemaOrDtoClass as ClassConstructor<T>,\n          body,\n          deepmerge(\n            {\n              whitelist: true,\n              ...classValidatorValidationOptions,\n            },\n            validationConfigs?.validationOptions || {}\n          )\n        );\n      else if (validationConfigs?.resolver === \"zod\" && schemaOrDtoClass)\n        req.body = await validateSchema(schemaOrDtoClass as ZodSchema<T>, body);\n\n      next();\n    }\n  );\n}\n\nexport function validateRequestInputs(\n  validators: ArkosRouteConfig[\"validation\"]\n) {\n  const arkosConfig = getArkosConfig();\n  const validationConfig = arkosConfig.validation;\n  const strictValidation = validationConfig?.strict;\n\n  if (!validationConfig?.resolver && validators)\n    throw Error(\n      \"Trying to pass validators into route config validation option without choosing a validation resolver under arkos.init({ validation: {} }).\"\n    );\n\n  if (strictValidation && !validators && validators !== false)\n    throw Error(\n      \"When using strict validation you must either pass { validation: false } in order to explicitly tell that no input will be received, or pass `undefined` for each input type e.g { validation: { query: undefined } } in order to deny the input of given request input.\"\n    );\n\n  const validatorFn: (validator: any, data: any) => Promise<any> =\n    validationConfig?.resolver == \"zod\" ? validateSchema : validateDto;\n  const validatorsKey: (\"body\" | \"query\" | \"params\")[] = [\n    \"body\",\n    \"query\",\n    \"params\",\n  ];\n\n  const isValidValidator =\n    validationConfig?.resolver == \"zod\" ? isZodSchema : isClass;\n  const validatorName =\n    validationConfig?.resolver == \"zod\" ? \"Zod Schema\" : \"Class-Validator Dto\";\n  const validatorNameType =\n    validationConfig?.resolver == \"zod\" ? \"Schema\" : \"Dto\";\n\n  if (validators)\n    validatorsKey.forEach((key) => {\n      if (strictValidation && !(key in validators))\n        throw Error(\n          `No { validation: { ${key}: ${validatorNameType} } } was found, while using strict validation you will need to pass undefined into ${key} in order to deny any request ${key} input.`\n        );\n\n      if (\n        key in validators &&\n        validators?.[key] !== undefined &&\n        !isValidValidator(validators[key])\n      )\n        throw Error(\n          `Please pass a valid ${validatorName} in order to use in { validation: { ${key}: ${validatorNameType} } }`\n        );\n    });\n\n  return catchAsync(\n    async (req: ArkosRequest, _: ArkosResponse, next: ArkosNextFunction) => {\n      for (const key of validatorsKey) {\n        const validator = validators?.[key];\n\n        if (strictValidation && !validator && Object.keys(req[key]).length > 0)\n          throw new AppError(\n            `No request ${key} is allowed on this route`,\n            400,\n            { [key]: req[key] },\n            `NoRequest${capitalize(key)}Allowed`\n          );\n\n        if (validator) req[key] = await validatorFn(validator, req[key]);\n      }\n\n      next();\n    }\n  );\n}\n"]}
+{"version":3,"file":"base.middlewares.js","sourceRoot":"","sources":["../../../../src/modules/base/base.middlewares.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,SAAS,MAAM,sCAAsC,CAAC;AAC7D,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,WAAW,MAAM,0BAA0B,CAAC;AACnD,OAAO,cAAc,MAAM,6BAA6B,CAAC;AAIzD,OAAO,EAAE,yBAAyB,EAAE,MAAM,0CAA0C,CAAC;AAErF,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAC9D,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAElE,MAAM,UAAU,QAAQ,CAAC,CAAU,EAAE,EAAY,EAAE,IAAkB;IACnE,IAAI,EAAE,CAAC;AACT,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,GAAiB,EAAE,GAAkB;IAChE,IAAI,MAAM,CAAC,GAAG,EAAE,cAAc,CAAC,KAAK,GAAG;QACrC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;SAC5C,IAAI,GAAG,CAAC,YAAY,IAAI,GAAG,EAAE,cAAc;QAC9C,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;SAC5D,IAAI,MAAM,CAAC,GAAG,EAAE,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY;QACvD,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;;QAE/C,GAAG;aACA,MAAM,CAAC,GAAG,CAAC;aACX,IAAI,CAAC,EAAE,OAAO,EAAE,4CAA4C,EAAE,CAAC,CAAC;AACvE,CAAC;AAED,MAAM,UAAU,4BAA4B,KAAI,CAAC;AAkBjD,MAAM,UAAU,8BAA8B,CAC5C,kBAAqE,EACrE,MAAyB;IAEzB,OAAO,CAAC,GAAiB,EAAE,CAAgB,EAAE,IAAkB,EAAE,EAAE;QACjE,MAAM,OAAO,GAAG,cAAc,EAAE,CAAC;QAEjC,MAAM,eAAe,GAAG,yBAAyB,CAC/C,kBAAkB,EAClB,MAAM,CACP,CAAC;QAEF,MAAM,mBAAmB,GAAG,OAAO,EAAE,OAAO,EAAE,UAAU;YACtD,EAAE,gCAAgC;YAClC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAE,GAAG,CAAC,KAAK,EAAE,kBAA6B,IAAI,IAAI,CAAC;YAC/D,CAAC,CAAC,EAAE,CAAC;QAEP,GAAG,CAAC,kBAAkB,GAAG,SAAS,CAAC,eAAe,EAAE,mBAAmB,CAAC,CAAC;QAEzE,IAAI,EAAE,CAAC;IACT,CAAC,CAAC;AACJ,CAAC;AAMD,MAAM,UAAU,iBAAiB,CAC/B,GAAY,EACZ,GAAa,EACb,IAAkB;IAElB,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAE7B,MAAM,YAAY,GAAG;QACnB,GAAG,EAAE,UAAU;QACf,IAAI,EAAE,UAAU;QAChB,GAAG,EAAE,UAAU;QACf,KAAK,EAAE,UAAU;QACjB,MAAM,EAAE,UAAU;QAClB,IAAI,EAAE,UAAU;QAChB,OAAO,EAAE,UAAU;KACpB,CAAC;IAEF,MAAM,cAAc,GAAG,CAAC,UAAkB,EAAE,EAAE;QAC5C,IAAI,UAAU,IAAI,GAAG,IAAI,UAAU,GAAG,GAAG;YAAE,OAAO,UAAU,CAAC;QAC7D,IAAI,UAAU,IAAI,GAAG,IAAI,UAAU,GAAG,GAAG;YAAE,OAAO,UAAU,CAAC;QAC7D,IAAI,UAAU,IAAI,GAAG,IAAI,UAAU,GAAG,GAAG;YAAE,OAAO,UAAU,CAAC;QAC7D,IAAI,UAAU,IAAI,GAAG;YAAE,OAAO,UAAU,CAAC;QACzC,OAAO,SAAS,CAAC;IACnB,CAAC,CAAC;IAEF,GAAG,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;QACpB,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;QAExC,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,IAAI,GAAG,GAAG,CAAC,YAAY,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAE9C,MAAM,WAAW,GACf,YAAY,CAAC,GAAG,CAAC,MAAmC,CAAC,IAAI,SAAS,CAAC;QACrE,MAAM,WAAW,GAAG,cAAc,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAEnD,OAAO,CAAC,IAAI,CACV,iCAAiC,IAAI,WAAW,WAAW,GACzD,GAAG,CAAC,MACN,WAAW,kBAAkB,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,WAAW,GAC3D,GAAG,CAAC,UACN,mBAAmB,QAAQ,WAAW,CACvC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,IAAI,EAAE,CAAC;AACT,CAAC;AASD,MAAM,UAAU,4CAA4C,CAC1D,gBAAqD,EACrD,+BAAkD;IAElD,OAAO,UAAU,CACf,KAAK,EAAE,GAAiB,EAAE,CAAgB,EAAE,IAAuB,EAAE,EAAE;QACrE,MAAM,iBAAiB,GAAG,cAAc,EAAE,EAAE,UAAU,CAAC;QACvD,IAAI,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;QAEpB,IAAI,iBAAiB,EAAE,QAAQ,KAAK,iBAAiB,IAAI,gBAAgB;YACvE,GAAG,CAAC,IAAI,GAAG,MAAM,WAAW,CAC1B,gBAAuC,EACvC,IAAI,EACJ,SAAS,CACP;gBACE,SAAS,EAAE,IAAI;gBACf,GAAG,+BAA+B;aACnC,EACD,iBAAiB,EAAE,iBAAiB,IAAI,EAAE,CAC3C,CACF,CAAC;aACC,IAAI,iBAAiB,EAAE,QAAQ,KAAK,KAAK,IAAI,gBAAgB;YAChE,GAAG,CAAC,IAAI,GAAG,MAAM,cAAc,CAAC,gBAAgC,EAAE,IAAI,CAAC,CAAC;QAE1E,IAAI,EAAE,CAAC;IACT,CAAC,CACF,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,qBAAqB,CACnC,qBAA2D;IAE3D,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;IACrC,MAAM,gBAAgB,GAAG,WAAW,CAAC,UAAU,CAAC;IAChD,MAAM,gBAAgB,GAAG,gBAAgB,EAAE,MAAM,CAAC;IAClD,MAAM,UAAU,GAAG,qBAAqB,EAAE,UAAU,CAAC;IAErD,IAAI,CAAC,gBAAgB,EAAE,QAAQ,IAAI,UAAU;QAC3C,MAAM,KAAK,CACT,4IAA4I,CAC7I,CAAC;IAEJ,MAAM,WAAW,GACf,gBAAgB,EAAE,QAAQ,IAAI,KAAK,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,WAAW,CAAC;IACrE,MAAM,aAAa,GAAoC;QACrD,MAAM;QACN,OAAO;QACP,QAAQ;KACT,CAAC;IAEF,MAAM,gBAAgB,GACpB,gBAAgB,EAAE,QAAQ,IAAI,KAAK,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC;IAC9D,MAAM,aAAa,GACjB,gBAAgB,EAAE,QAAQ,IAAI,KAAK,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,qBAAqB,CAAC;IAC7E,MAAM,iBAAiB,GACrB,gBAAgB,EAAE,QAAQ,IAAI,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC;IAEzD,IAAI,UAAU;QACZ,aAAa,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YAC5B,IAAI,gBAAgB,IAAI,CAAC,CAAC,GAAG,IAAI,UAAU,CAAC;gBAC1C,MAAM,KAAK,CACT,sBAAsB,GAAG,KAAK,iBAAiB,sFAAsF,GAAG,iCAAiC,GAAG,SAAS,CACtL,CAAC;YAEJ,IACE,GAAG,IAAI,UAAU;gBACjB,UAAU,EAAE,CAAC,GAAG,CAAC,KAAK,SAAS;gBAC/B,CAAC,gBAAgB,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;gBAElC,MAAM,KAAK,CACT,0BAA0B,aAAa,uCAAuC,GAAG,KAAK,iBAAiB,MAAM,CAC9G,CAAC;QACN,CAAC,CAAC,CAAC;IAEL,OAAO,UAAU,CACf,KAAK,EAAE,GAAiB,EAAE,CAAgB,EAAE,IAAuB,EAAE,EAAE;QACrE,KAAK,MAAM,GAAG,IAAI,aAAa,EAAE,CAAC;YAChC,MAAM,SAAS,GAAG,UAAU,EAAE,CAAC,GAAG,CAAC,CAAC;YAEpC,IAAI,gBAAgB,IAAI,CAAC,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC;gBACpE,MAAM,IAAI,QAAQ,CAChB,cAAc,GAAG,2BAA2B,EAC5C,GAAG,EACH,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,EAAE,EACnB,YAAY,UAAU,CAAC,GAAG,CAAC,SAAS,CACrC,CAAC;YAEJ,IAAI,SAAS;gBAAE,GAAG,CAAC,GAAG,CAAC,GAAG,MAAM,WAAW,CAAC,SAAS,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;QACnE,CAAC;QAED,IAAI,EAAE,CAAC;IACT,CAAC,CACF,CAAC;AACJ,CAAC","sourcesContent":["import { NextFunction, Request, Response } from \"express\";\nimport {\n  PrismaQueryOptions,\n  ArkosNextFunction,\n  ArkosRequest,\n  ArkosRequestHandler,\n  ArkosResponse,\n  AuthPrismaQueryOptions,\n} from \"../../types\";\nimport { getArkosConfig } from \"../../server\";\nimport deepmerge from \"../../utils/helpers/deepmerge.helper\";\nimport { AppError, catchAsync } from \"../../exports/error-handler\";\nimport validateDto from \"../../utils/validate-dto\";\nimport validateSchema from \"../../utils/validate-schema\";\nimport { ZodSchema } from \"zod\";\nimport { ClassConstructor } from \"class-transformer\";\nimport { ValidatorOptions } from \"class-validator\";\nimport { resolvePrismaQueryOptions } from \"./utils/helpers/base.middlewares.helpers\";\nimport { ArkosRouteConfig } from \"../../utils/arkos-router/types\";\nimport { capitalize } from \"../../utils/helpers/text.helpers\";\nimport { isClass, isZodSchema } from \"../../utils/dynamic-loader\";\n\nexport function callNext(_: Request, _1: Response, next: NextFunction) {\n  next();\n}\n\nexport function sendResponse(req: ArkosRequest, res: ArkosResponse) {\n  if (Number(req?.responseStatus) === 204)\n    res.status(Number(req?.responseStatus)).send();\n  else if (req.responseData && req?.responseStatus)\n    res.status(Number(req?.responseStatus)).json(req.responseData);\n  else if (Number(req?.responseStatus) && !req.responseData)\n    res.status(Number(req?.responseStatus)).send();\n  else\n    res\n      .status(500)\n      .json({ message: \"No status or data attached to the response\" });\n}\n\nexport function addRouteMiddlwaresAndConfigs() {}\n\n/**\n * Type representing all possible actions that can be performed on a controller\n * Combines both standard CRUD operations and auth-specific operations\n */\nexport type ControllerActions =\n  | keyof PrismaQueryOptions<any>\n  | keyof Omit<AuthPrismaQueryOptions<any>, keyof PrismaQueryOptions<any>>;\n\n/**\n * Middleware to add Prisma query options to the request's query parameters.\n *\n * @template T - The type of the Prisma model.\n * @param {PrismaQueryOptions<T> | AuthPrismaQueryOptions<T>} prismaQueryOptions - The Prisma query options to attach.\n * @param {ControllerActions} action - The controller action to apply.\n * @returns A middleware function that attaches the query options to the request.\n */\nexport function addPrismaQueryOptionsToRequest<T extends Record<string, any>>(\n  prismaQueryOptions: PrismaQueryOptions<T> | AuthPrismaQueryOptions<T>,\n  action: ControllerActions\n) {\n  return (req: ArkosRequest, _: ArkosResponse, next: NextFunction) => {\n    const configs = getArkosConfig();\n\n    const resolvedOptions = resolvePrismaQueryOptions(\n      prismaQueryOptions,\n      action\n    );\n\n    const requestQueryOptions = configs?.request?.parameters\n      ?.allowDangerousPrismaQueryOptions\n      ? JSON.parse((req.query?.prismaQueryOptions as string) || \"{}\")\n      : {};\n\n    req.prismaQueryOptions = deepmerge(resolvedOptions, requestQueryOptions);\n\n    next();\n  };\n}\n\n/**\n * Logs request events with colored text such as errors, requests responses.\n *\n */\nexport function handleRequestLogs(\n  req: Request,\n  res: Response,\n  next: NextFunction\n) {\n  const startTime = Date.now();\n\n  const methodColors = {\n    GET: \"\\x1b[36m\", // Cyan\n    POST: \"\\x1b[32m\", // Green\n    PUT: \"\\x1b[33m\", // Orange/Yellow\n    PATCH: \"\\x1b[33m\", // Orange/Yellow\n    DELETE: \"\\x1b[31m\", // Red\n    HEAD: \"\\x1b[34m\", // Blue\n    OPTIONS: \"\\x1b[34m\", // Blue\n  };\n\n  const getStatusColor = (statusCode: number) => {\n    if (statusCode >= 200 && statusCode < 300) return \"\\x1b[32m\"; // Green\n    if (statusCode >= 300 && statusCode < 400) return \"\\x1b[33m\"; // Orange/Yellow\n    if (statusCode >= 400 && statusCode < 500) return \"\\x1b[33m\"; // Red\n    if (statusCode >= 500) return \"\\x1b[31m\"; // White on Red background\n    return \"\\x1b[0m\";\n  };\n\n  res.on(\"finish\", () => {\n    const duration = Date.now() - startTime;\n\n    const now = new Date();\n    const time = now.toTimeString().split(\" \")[0];\n\n    const methodColor =\n      methodColors[req.method as keyof typeof methodColors] || \"\\x1b[0m\";\n    const statusColor = getStatusColor(res.statusCode);\n\n    console.info(\n      `[\\x1b[36mInfo\\x1b[0m] \\x1b[90m${time}\\x1b[0m ${methodColor}${\n        req.method\n      }\\x1b[0m ${decodeURIComponent(req.originalUrl)} ${statusColor}${\n        res.statusCode\n      }\\x1b[0m \\x1b[35m${duration}ms\\x1b[0m`\n    );\n  });\n\n  next();\n}\n\nexport function handleRequestBodyValidationAndTransformation<T extends object>(\n  schemaOrDtoClass?: ClassConstructor<T>,\n  classValidatorValidationOptions?: ValidatorOptions\n): ArkosRequestHandler;\nexport function handleRequestBodyValidationAndTransformation<T extends object>(\n  schemaOrDtoClass?: ZodSchema<T>\n): ArkosRequestHandler;\nexport function handleRequestBodyValidationAndTransformation<T extends object>(\n  schemaOrDtoClass?: ZodSchema<T> | ClassConstructor<T>,\n  classValidatorValidationOptions?: ValidatorOptions\n) {\n  return catchAsync(\n    async (req: ArkosRequest, _: ArkosResponse, next: ArkosNextFunction) => {\n      const validationConfigs = getArkosConfig()?.validation;\n      let body = req.body;\n\n      if (validationConfigs?.resolver === \"class-validator\" && schemaOrDtoClass)\n        req.body = await validateDto(\n          schemaOrDtoClass as ClassConstructor<T>,\n          body,\n          deepmerge(\n            {\n              whitelist: true,\n              ...classValidatorValidationOptions,\n            },\n            validationConfigs?.validationOptions || {}\n          )\n        );\n      else if (validationConfigs?.resolver === \"zod\" && schemaOrDtoClass)\n        req.body = await validateSchema(schemaOrDtoClass as ZodSchema<T>, body);\n\n      next();\n    }\n  );\n}\n\nexport function validateRequestInputs(\n  validationRouteConfig: Pick<ArkosRouteConfig, \"validation\">\n) {\n  const arkosConfig = getArkosConfig();\n  const validationConfig = arkosConfig.validation;\n  const strictValidation = validationConfig?.strict;\n  const validators = validationRouteConfig?.validation;\n\n  if (!validationConfig?.resolver && validators)\n    throw Error(\n      \"Trying to pass validators into route config validation option without choosing a validation resolver under arkos.init({ validation: {} }).\"\n    );\n\n  const validatorFn: (validator: any, data: any) => Promise<any> =\n    validationConfig?.resolver == \"zod\" ? validateSchema : validateDto;\n  const validatorsKey: (\"body\" | \"query\" | \"params\")[] = [\n    \"body\",\n    \"query\",\n    \"params\",\n  ];\n\n  const isValidValidator =\n    validationConfig?.resolver == \"zod\" ? isZodSchema : isClass;\n  const validatorName =\n    validationConfig?.resolver == \"zod\" ? \"Zod Schema\" : \"Class-Validator Dto\";\n  const validatorNameType =\n    validationConfig?.resolver == \"zod\" ? \"Schema\" : \"Dto\";\n\n  if (validators)\n    validatorsKey.forEach((key) => {\n      if (strictValidation && !(key in validators))\n        throw Error(\n          `No { validation: { ${key}: ${validatorNameType} } } was found, while using strict validation you will need to pass undefined into ${key} in order to deny any request ${key} input.`\n        );\n\n      if (\n        key in validators &&\n        validators?.[key] !== undefined &&\n        !isValidValidator(validators[key])\n      )\n        throw Error(\n          `Please provide a valid ${validatorName} in order to use in { validation: { ${key}: ${validatorNameType} } }`\n        );\n    });\n\n  return catchAsync(\n    async (req: ArkosRequest, _: ArkosResponse, next: ArkosNextFunction) => {\n      for (const key of validatorsKey) {\n        const validator = validators?.[key];\n\n        if (strictValidation && !validator && Object.keys(req[key]).length > 0)\n          throw new AppError(\n            `No request ${key} is allowed on this route`,\n            400,\n            { [key]: req[key] },\n            `NoRequest${capitalize(key)}Allowed`\n          );\n\n        if (validator) req[key] = await validatorFn(validator, req[key]);\n      }\n\n      next();\n    }\n  );\n}\n"]}

package/dist/esm/utils/arkos-router/index.js

@@ -28,23 +28,28 @@ export default function ArkosRouter() {
                         const method = prop;
                         route = config.route;
                         if (handlers.length > 0) {
+                            handlers = handlers.map((handler) => catchAsync(handler, {
+                                type: handler.length > 3 ? "error" : "normal",
+                            }));
                             const finalHandler = handlers[handlers.length - 1];
                             RouteConfigRegistry.register(finalHandler, config, method);
                         }
                         const arkosConfig = getArkosConfig();
                         const validationConfig = arkosConfig.validation;
                         const authenticationConfig = arkosConfig.authentication;
+                        if (validationConfig?.strict &&
+                            "validation" in config &&
+                            !config?.validation &&
+                            config?.validation !== undefined)
+                            throw Error("When using strict validation you must either pass { validation: false } in order to explicitly tell that no input will be received, or pass `undefined` for each input type e.g { validation: { query: undefined } } in order to deny the input of given request input.");
                         if (!validationConfig?.resolver && config.validation)
                             throw Error("Trying to pass validators into route config validation option without choosing a validation resolver under arkos.init({ validation: { resolver: '' } })");
                         if (!authenticationConfig?.mode && config.authentication)
                             throw Error("Trying to authenticate a route without choosing an authentication mode under arkos.init({ authentication: { mode: '' } })");
-                        handlers = [
-                            ...getMiddlewareStack(config),
-                            ...handlers.map((handler) => catchAsync(handler, {
-                                type: handler.length > 3 ? "error" : "normal",
-                            })),
-                        ];
+                        handlers = [...getMiddlewareStack(config), ...handlers];
                     }
+                    else
+                        throw Error(`First argument of ArkosRouter().${prop}() must be a valid ArkosRouteConfig but recevied ${firstArg}`);
                     return originalMethod.call(target, route, ...handlers);
                 };
             }

package/dist/esm/utils/arkos-router/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/utils/arkos-router/index.ts"],"names":[],"mappings":"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","sourcesContent":["import { Router } from \"express\";\nimport { IArkosRouter, ArkosRouteConfig } from \"./types\";\nimport { OpenAPIV3 } from \"openapi-types\";\nimport RouteConfigValidator from \"./route-config-validator\";\nimport RouteConfigRegistry from \"./route-config-registry\";\nimport { extractArkosRoutes, getMiddlewareStack } from \"./utils/helpers\";\nimport { getArkosConfig } from \"../../exports\";\nimport { catchAsync } from \"../../exports/error-handler\";\nimport { ArkosErrorRequestHandler, ArkosRequestHandler } from \"../../types\";\n\n/**\n * Creates an enhanced Express Router with features like OpenAPI documentation capabilities and smart data validation.\n *\n * The ArkosRouter extends the standard Express Router with the ability to\n * automatically capture OpenAPI metadata from route configurations.\n *\n * @example\n * const router = ArkosRouter();\n *\n * router.get(\n *   {\n *     route: \"/users/:id\",\n *     openapi: {\n *       summary: \"Get user by ID\",\n *       tags: [\"Users\"]\n *     }\n *   },\n *   (req, res) => { ... }\n * );\n *\n * @returns {IArkosRouter} A proxied Express Router instance with enhanced OpenAPI capabilities\n *\n * @see {@link ArkosRouteConfig} for configuration options\n */\nexport default function ArkosRouter(): IArkosRouter {\n  const router: IArkosRouter = Router();\n\n  return new Proxy(router, {\n    get(target, prop, receiver) {\n      const originalMethod = Reflect.get(target, prop, receiver);\n\n      const httpMethods = [\n        \"get\",\n        \"post\",\n        \"put\",\n        \"patch\",\n        \"delete\",\n        \"all\",\n        \"head\",\n        \"trace\",\n        \"options\",\n      ];\n\n      if (httpMethods.includes(prop as string)) {\n        return function (\n          firstArg: any,\n          ...handlers: (ArkosRequestHandler | ArkosErrorRequestHandler)[]\n        ) {\n          let route = firstArg;\n          if (RouteConfigValidator.isArkosRouteConfig(firstArg)) {\n            const config = firstArg as ArkosRouteConfig;\n            const method = prop as string;\n            route = config.route;\n\n            if (handlers.length > 0) {\n              const finalHandler = handlers[handlers.length - 1];\n              RouteConfigRegistry.register(finalHandler, config, method);\n            }\n\n            const arkosConfig = getArkosConfig();\n            const validationConfig = arkosConfig.validation;\n            const authenticationConfig = arkosConfig.authentication;\n\n            if (!validationConfig?.resolver && config.validation)\n              throw Error(\n                \"Trying to pass validators into route config validation option without choosing a validation resolver under arkos.init({ validation: { resolver: '' } })\"\n              );\n\n            if (!authenticationConfig?.mode && config.authentication)\n              throw Error(\n                \"Trying to authenticate a route without choosing an authentication mode under arkos.init({ authentication: { mode: '' } })\"\n              );\n\n            handlers = [\n              ...getMiddlewareStack(config),\n              ...handlers.map((handler) =>\n                catchAsync(handler, {\n                  type: handler.length > 3 ? \"error\" : \"normal\",\n                })\n              ),\n            ];\n          }\n\n          return originalMethod.call(target, route, ...handlers);\n        };\n      }\n      return originalMethod;\n    },\n  }) as IArkosRouter;\n}\n\nexport function generateOpenAPIFromApp(app: any) {\n  const routes = extractArkosRoutes(app);\n  const paths: Record<\n    string,\n    Record<string, Partial<OpenAPIV3.OperationObject>>\n  > = {};\n\n  routes.forEach(({ path, method, config }) => {\n    if (config?.openapi === false) return;\n\n    if (!paths[path]) paths[path] = {};\n\n    if (typeof config?.openapi === \"boolean\") {\n      config = {\n        ...config,\n        openapi: {},\n      };\n    }\n\n    const openapi =\n      typeof config?.openapi === \"object\" && config.openapi !== null\n        ? config.openapi\n        : {};\n\n    paths[path][method.toLowerCase()] = {\n      summary: openapi?.summary || `${method} ${path}`,\n      description: openapi?.description || `${method} ${path}`,\n      tags: openapi?.tags || [\"Others\"],\n      operationId: `${method}:${path}`,\n      ...openapi,\n    };\n  });\n\n  return paths;\n}\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/utils/arkos-router/index.ts"],"names":[],"mappings":"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","sourcesContent":["import { Router } from \"express\";\nimport { IArkosRouter, ArkosRouteConfig } from \"./types\";\nimport { OpenAPIV3 } from \"openapi-types\";\nimport RouteConfigValidator from \"./route-config-validator\";\nimport RouteConfigRegistry from \"./route-config-registry\";\nimport { extractArkosRoutes, getMiddlewareStack } from \"./utils/helpers\";\nimport { getArkosConfig } from \"../../exports\";\nimport { catchAsync } from \"../../exports/error-handler\";\nimport { ArkosErrorRequestHandler, ArkosRequestHandler } from \"../../types\";\n\n/**\n * Creates an enhanced Express Router with features like OpenAPI documentation capabilities and smart data validation.\n *\n * The ArkosRouter extends the standard Express Router with the ability to\n * automatically capture OpenAPI metadata from route configurations.\n *\n * @example\n * const router = ArkosRouter();\n *\n * router.get(\n *   {\n *     route: \"/users/:id\",\n *     openapi: {\n *       summary: \"Get user by ID\",\n *       tags: [\"Users\"]\n *     }\n *   },\n *   (req, res) => { ... }\n * );\n *\n * @returns {IArkosRouter} A proxied Express Router instance with enhanced OpenAPI capabilities\n *\n * @see {@link ArkosRouteConfig} for configuration options\n */\nexport default function ArkosRouter(): IArkosRouter {\n  const router: IArkosRouter = Router();\n\n  return new Proxy(router, {\n    get(target, prop, receiver) {\n      const originalMethod = Reflect.get(target, prop, receiver);\n\n      const httpMethods = [\n        \"get\",\n        \"post\",\n        \"put\",\n        \"patch\",\n        \"delete\",\n        \"all\",\n        \"head\",\n        \"trace\",\n        \"options\",\n      ];\n\n      if (httpMethods.includes(prop as string)) {\n        return function (\n          firstArg: any,\n          ...handlers: (ArkosRequestHandler | ArkosErrorRequestHandler)[]\n        ) {\n          let route = firstArg;\n          if (RouteConfigValidator.isArkosRouteConfig(firstArg)) {\n            const config = firstArg as ArkosRouteConfig;\n            const method = prop as string;\n            route = config.route;\n\n            if (handlers.length > 0) {\n              handlers = handlers.map((handler) =>\n                catchAsync(handler, {\n                  type: handler.length > 3 ? \"error\" : \"normal\",\n                })\n              );\n\n              const finalHandler = handlers[handlers.length - 1];\n              RouteConfigRegistry.register(finalHandler, config, method);\n            }\n\n            const arkosConfig = getArkosConfig();\n            const validationConfig = arkosConfig.validation;\n            const authenticationConfig = arkosConfig.authentication;\n\n            if (\n              validationConfig?.strict &&\n              \"validation\" in config &&\n              !config?.validation &&\n              config?.validation !== undefined\n            )\n              throw Error(\n                \"When using strict validation you must either pass { validation: false } in order to explicitly tell that no input will be received, or pass `undefined` for each input type e.g { validation: { query: undefined } } in order to deny the input of given request input.\"\n              );\n\n            if (!validationConfig?.resolver && config.validation)\n              throw Error(\n                \"Trying to pass validators into route config validation option without choosing a validation resolver under arkos.init({ validation: { resolver: '' } })\"\n              );\n\n            if (!authenticationConfig?.mode && config.authentication)\n              throw Error(\n                \"Trying to authenticate a route without choosing an authentication mode under arkos.init({ authentication: { mode: '' } })\"\n              );\n\n            handlers = [...getMiddlewareStack(config), ...handlers];\n          } else\n            throw Error(\n              `First argument of ArkosRouter().${prop as string}() must be a valid ArkosRouteConfig but recevied ${firstArg}`\n            );\n\n          return originalMethod.call(target, route, ...handlers);\n        };\n      }\n      return originalMethod;\n    },\n  }) as IArkosRouter;\n}\n\nexport function generateOpenAPIFromApp(app: any) {\n  const routes = extractArkosRoutes(app);\n  const paths: Record<\n    string,\n    Record<string, Partial<OpenAPIV3.OperationObject>>\n  > = {};\n\n  routes.forEach(({ path, method, config }) => {\n    if (config?.openapi === false) return;\n\n    if (!paths[path]) paths[path] = {};\n\n    if (typeof config?.openapi === \"boolean\") {\n      config = {\n        ...config,\n        openapi: {},\n      };\n    }\n\n    const openapi =\n      typeof config?.openapi === \"object\" && config.openapi !== null\n        ? config.openapi\n        : {};\n\n    paths[path][method.toLowerCase()] = {\n      summary: openapi?.summary || `${method} ${path}`,\n      description: openapi?.description || `${method} ${path}`,\n      tags: openapi?.tags || [\"Others\"],\n      operationId: `${method}:${path}`,\n      ...openapi,\n    };\n  });\n\n  return paths;\n}\n"]}

package/dist/esm/utils/arkos-router/types/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/utils/arkos-router/types/index.ts"],"names":[],"mappings":"","sourcesContent":["import { ErrorRequestHandler, IRouter, RequestHandler } from \"express\";\nimport { OpenAPIV3 } from \"openapi-types\";\nimport { ZodSchema } from \"zod\";\n\ntype MethodHandler = (\n  configOrPath: string | ArkosRouteConfig,\n  ...handlers: (RequestHandler | ErrorRequestHandler)[]\n) => IArkosRouter;\n\nexport interface IArkosRouter\n  extends Omit<\n    IRouter,\n    | \"get\"\n    | \"post\"\n    | \"put\"\n    | \"patch\"\n    | \"delete\"\n    | \"options\"\n    | \"head\"\n    | \"trace\"\n    | \"all\"\n  > {\n  get: MethodHandler;\n  post: MethodHandler;\n  put: MethodHandler;\n  patch: MethodHandler;\n  delete: MethodHandler;\n  options: MethodHandler;\n  head: MethodHandler;\n  trace: MethodHandler;\n  all: MethodHandler;\n}\n\nexport interface ArkosRouteConfig {\n  route: string;\n  authentication?:\n    | boolean\n    | {\n        resource: string;\n        action: string;\n        rule?: any;\n      };\n  validation?: {\n    query?: ZodSchema | (new (...args: any[]) => object) | undefined;\n    body?: ZodSchema | (new (...args: any[]) => object) | undefined;\n    params?: ZodSchema | (new (...args: any[]) => object) | undefined;\n  };\n  openapi?: boolean | Partial<OpenAPIV3.OperationObject>;\n}\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/utils/arkos-router/types/index.ts"],"names":[],"mappings":"","sourcesContent":["import { ErrorRequestHandler, IRouter, RequestHandler } from \"express\";\nimport { OpenAPIV3 } from \"openapi-types\";\nimport { ZodSchema } from \"zod\";\n\ntype MethodHandler = (\n  configOrPath: ArkosRouteConfig,\n  ...handlers: (RequestHandler | ErrorRequestHandler)[]\n) => IArkosRouter;\n\nexport interface IArkosRouter\n  extends Omit<\n    IRouter,\n    | \"get\"\n    | \"post\"\n    | \"put\"\n    | \"patch\"\n    | \"delete\"\n    | \"options\"\n    | \"head\"\n    | \"trace\"\n    | \"all\"\n  > {\n  get: MethodHandler;\n  post: MethodHandler;\n  put: MethodHandler;\n  patch: MethodHandler;\n  delete: MethodHandler;\n  options: MethodHandler;\n  head: MethodHandler;\n  trace: MethodHandler;\n  all: MethodHandler;\n}\n\nexport interface ArkosRouteConfig {\n  route: string;\n  authentication?:\n    | boolean\n    | {\n        resource: string;\n        action: string;\n        rule?: any;\n      };\n  validation?:\n    | undefined\n    | {\n        query?: ZodSchema | (new (...args: any[]) => object) | undefined;\n        body?: ZodSchema | (new (...args: any[]) => object) | undefined;\n        params?: ZodSchema | (new (...args: any[]) => object) | undefined;\n      };\n  openapi?: boolean | Partial<OpenAPIV3.OperationObject>;\n}\n"]}

package/dist/esm/utils/arkos-router/utils/helpers/index.js

@@ -57,8 +57,7 @@ export function getMiddlewareStack(config) {
         middlewares.push(authService.handleAccessControl(config.authentication.action, config.authentication.resource, {
             [config.authentication.action]: config.authentication?.rule,
         }));
-    if (typeof config?.validation === "object" && config?.validation)
-        middlewares.push(validateRequestInputs(config.validation));
+    middlewares.push(validateRequestInputs(config));
     return middlewares;
 }
 //# sourceMappingURL=index.js.map

package/dist/esm/utils/arkos-router/utils/helpers/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/utils/arkos-router/utils/helpers/index.ts"],"names":[],"mappings":"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","sourcesContent":["import { authService } from \"../../../../exports/services\";\nimport { validateRequestInputs } from \"../../../../modules/base/base.middlewares\";\nimport RouteConfigRegistry from \"../../route-config-registry\";\nimport { ArkosRouteConfig } from \"../../types\";\n\nexport function extractArkosRoutes(\n  app: any,\n  basePath = \"\"\n): Array<{\n  path: string;\n  method: string;\n  config?: ArkosRouteConfig;\n}> {\n  const routes: Array<{\n    path: string;\n    method: string;\n    config?: ArkosRouteConfig;\n  }> = [];\n\n  function extractFromStack(stack: any[], prefix = \"\") {\n    stack.forEach((layer: any) => {\n      if (layer.route) {\n        const fullPath = prefix + layer.route.path;\n        const methods = Object.keys(layer.route.methods);\n\n        methods.forEach((method) => {\n          const handlers = layer.route.stack || [];\n          let config: ArkosRouteConfig | undefined;\n\n          for (const handler of handlers) {\n            const foundConfig = RouteConfigRegistry.get(handler.handle);\n\n            if (foundConfig) {\n              config = foundConfig;\n              routes.push({\n                path: fullPath,\n                method: method.toUpperCase(),\n                config,\n              });\n\n              break;\n            }\n          }\n        });\n      } else if (layer.name === \"router\" && layer.handle?.stack) {\n        let nestedPrefix = prefix;\n\n        if (layer.regexp) {\n          const match = layer.regexp\n            .toString()\n            .match(/\\/\\^?(\\\\\\/[^?]+|\\/[^?]+)/);\n          if (match) {\n            nestedPrefix = prefix + \"/\" + match[1].replace(/\\\\\\//g, \"/\");\n            nestedPrefix = nestedPrefix\n              .replace(/\\/\\//g, \"/\")\n              .replace(/\\/$/, \"\");\n          }\n        }\n\n        extractFromStack(layer.handle.stack, nestedPrefix);\n      }\n    });\n  }\n\n  const stack = app._router?.stack || app.stack;\n  if (stack) extractFromStack(stack, basePath);\n\n  return routes;\n}\n\nexport function getMiddlewareStack(config: ArkosRouteConfig) {\n  const middlewares = [];\n  if (config.authentication) middlewares.push(authService.authenticate);\n  if (\n    typeof config.authentication === \"object\" &&\n    config.authentication.action &&\n    config.authentication.resource\n  )\n    middlewares.push(\n      authService.handleAccessControl(\n        config.authentication.action,\n        config.authentication.resource,\n        {\n          [config.authentication.action]: config.authentication?.rule,\n        }\n      )\n    );\n\n  if (typeof config?.validation === \"object\" && config?.validation)\n    middlewares.push(validateRequestInputs(config.validation));\n\n  return middlewares;\n}\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/utils/arkos-router/utils/helpers/index.ts"],"names":[],"mappings":"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","sourcesContent":["import { authService } from \"../../../../exports/services\";\nimport { validateRequestInputs } from \"../../../../modules/base/base.middlewares\";\nimport RouteConfigRegistry from \"../../route-config-registry\";\nimport { ArkosRouteConfig } from \"../../types\";\n\nexport function extractArkosRoutes(\n  app: any,\n  basePath = \"\"\n): Array<{\n  path: string;\n  method: string;\n  config?: ArkosRouteConfig;\n}> {\n  const routes: Array<{\n    path: string;\n    method: string;\n    config?: ArkosRouteConfig;\n  }> = [];\n\n  function extractFromStack(stack: any[], prefix = \"\") {\n    stack.forEach((layer: any) => {\n      if (layer.route) {\n        const fullPath = prefix + layer.route.path;\n        const methods = Object.keys(layer.route.methods);\n\n        methods.forEach((method) => {\n          const handlers = layer.route.stack || [];\n          let config: ArkosRouteConfig | undefined;\n\n          for (const handler of handlers) {\n            const foundConfig = RouteConfigRegistry.get(handler.handle);\n\n            if (foundConfig) {\n              config = foundConfig;\n              routes.push({\n                path: fullPath,\n                method: method.toUpperCase(),\n                config,\n              });\n\n              break;\n            }\n          }\n        });\n      } else if (layer.name === \"router\" && layer.handle?.stack) {\n        let nestedPrefix = prefix;\n\n        if (layer.regexp) {\n          const match = layer.regexp\n            .toString()\n            .match(/\\/\\^?(\\\\\\/[^?]+|\\/[^?]+)/);\n          if (match) {\n            nestedPrefix = prefix + \"/\" + match[1].replace(/\\\\\\//g, \"/\");\n            nestedPrefix = nestedPrefix\n              .replace(/\\/\\//g, \"/\")\n              .replace(/\\/$/, \"\");\n          }\n        }\n\n        extractFromStack(layer.handle.stack, nestedPrefix);\n      }\n    });\n  }\n\n  const stack = app._router?.stack || app.stack;\n  if (stack) extractFromStack(stack, basePath);\n\n  return routes;\n}\n\nexport function getMiddlewareStack(config: ArkosRouteConfig) {\n  const middlewares = [];\n  if (config.authentication) middlewares.push(authService.authenticate);\n  if (\n    typeof config.authentication === \"object\" &&\n    config.authentication.action &&\n    config.authentication.resource\n  )\n    middlewares.push(\n      authService.handleAccessControl(\n        config.authentication.action,\n        config.authentication.resource,\n        {\n          [config.authentication.action]: config.authentication?.rule,\n        }\n      )\n    );\n\n  middlewares.push(validateRequestInputs(config));\n\n  return middlewares;\n}\n"]}

package/dist/esm/utils/cli/utils/cli.helpers.js

@@ -11,6 +11,6 @@ export function killServerChildProcess() {
     killProductionServerChildProcess();
 }
 export function getVersion() {
-    return "1.4.0-canary.6";
+    return "1.4.0-canary.7";
 }
 //# sourceMappingURL=cli.helpers.js.map

package/dist/esm/utils/cli/utils/template-generator/templates/router-template.js

@@ -14,21 +14,22 @@ export function generateRouterTemplate(options) {
         : `import ${modelName.camel}Controller from "${imports?.controller ||
             `./${modelName.kebab}.controller${ext === "js" ? "." + "js" : ""}`}"`;
     const controllerHandlerLine = `${modelName.camel}Controller.someHandler`;
-    return `import { Router } from 'express'
-import { authService } from 'arkos/services'
-import { catchAsync } from 'arkos/error-handler'
+    return `import { ArkosRouter } from 'arkos'
 ${controllerImportLine}
 ${routerConfigTsTypeImport}
 
 export const config${routerConfigTsType} = { }
 
-const ${modelName.camel}Router = Router()
+const ${modelName.camel}Router = ArkosRouter()
 
 ${modelName.camel}Router.get(
-  '/custom-endpoint',
-  authService.authenticate,
-  authService.handleAccessControl('CustomAction', '${modelName.kebab}'),
-  catchAsync(${controllerHandlerLine})
+  {
+    route: "/custom-endpoint",
+    authentication: { action: "CustomAction", resource: "${modelName.kebab}" },
+    validation: {},
+    openapi: {}
+  },
+  ${controllerHandlerLine}
 )
 
 export default ${modelName.camel}Router

package/dist/esm/utils/cli/utils/template-generator/templates/router-template.js.map

@@ -1 +1 @@
-{"version":3,"file":"router-template.js","sourceRoot":"","sources":["../../../../../../../src/utils/cli/utils/template-generator/templates/router-template.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,oBAAoB,GACrB,MAAM,gCAAgC,CAAC;AAGxC,MAAM,UAAU,sBAAsB,CAAC,OAAwB;IAC7D,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAEvC,IAAI,CAAC,SAAS;QACZ,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;IAEjE,MAAM,GAAG,GAAG,oBAAoB,EAAE,CAAC;IACnC,MAAM,cAAc,GAClB,OAAO,EAAE,UAAU,IAAI,KAAK,SAAS,CAAC,KAAK,eAAe,GAAG,EAAE,CAAC;IAElE,MAAM,kBAAkB,GAAG,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC;IAChE,MAAM,wBAAwB,GAC5B,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,sCAAsC,CAAC,CAAC,CAAC,EAAE,CAAC;IAE7D,MAAM,gBAAgB,GAAG,eAAe,CAAC,cAAc,CAAC,CAAC;IAEzD,MAAM,oBAAoB,GAAG,gBAAgB;QAC3C,CAAC,CAAC,UAAU,SAAS,CAAC,KAAK,oBACvB,OAAO,EAAE,UAAU;YACnB,KAAK,SAAS,CAAC,KAAK,cAAc,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,EAClE,GAAG;QACL,CAAC,CAAC,UAAU,SAAS,CAAC,KAAK,oBACvB,OAAO,EAAE,UAAU;YACnB,KAAK,SAAS,CAAC,KAAK,cAAc,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,EAClE,GAAG,CAAC;IAER,MAAM,qBAAqB,GAAG,GAAG,SAAS,CAAC,KAAK,wBAAwB,CAAC;IAEzE,OAAO;;;EAGP,oBAAoB;EACpB,wBAAwB;;qBAEL,kBAAkB;;QAE/B,SAAS,CAAC,KAAK;;EAErB,SAAS,CAAC,KAAK;;;qDAGoC,SAAS,CAAC,KAAK;eACrD,qBAAqB;;;iBAGnB,SAAS,CAAC,KAAK;CAC/B,CAAC;AACF,CAAC","sourcesContent":["import {\n  checkFileExists,\n  getUserFileExtension,\n} from \"../../../../helpers/fs.helpers\";\nimport { TemplateOptions } from \"../../template-generators\";\n\nexport function generateRouterTemplate(options: TemplateOptions): string {\n  const { modelName, imports } = options;\n\n  if (!modelName)\n    throw new Error(\"Module name is required for router template\");\n\n  const ext = getUserFileExtension();\n  const controllerPath =\n    imports?.controller || `./${modelName.kebab}.controller.${ext}`;\n\n  const routerConfigTsType = ext === \"ts\" ? \": RouterConfig\" : \"\";\n  const routerConfigTsTypeImport =\n    ext === \"ts\" ? \"import { RouterConfig } from 'arkos'\" : \"\";\n\n  const controllerExists = checkFileExists(controllerPath);\n\n  const controllerImportLine = controllerExists\n    ? `import ${modelName.camel}Controller from \"${\n        imports?.controller ||\n        `./${modelName.kebab}.controller${ext === \"js\" ? \".\" + \"js\" : \"\"}`\n      }\"`\n    : `import ${modelName.camel}Controller from \"${\n        imports?.controller ||\n        `./${modelName.kebab}.controller${ext === \"js\" ? \".\" + \"js\" : \"\"}`\n      }\"`;\n\n  const controllerHandlerLine = `${modelName.camel}Controller.someHandler`;\n\n  return `import { Router } from 'express'\nimport { authService } from 'arkos/services'\nimport { catchAsync } from 'arkos/error-handler'\n${controllerImportLine}\n${routerConfigTsTypeImport}\n\nexport const config${routerConfigTsType} = { }\n\nconst ${modelName.camel}Router = Router()\n\n${modelName.camel}Router.get(\n  '/custom-endpoint',\n  authService.authenticate,\n  authService.handleAccessControl('CustomAction', '${modelName.kebab}'),\n  catchAsync(${controllerHandlerLine})\n)\n\nexport default ${modelName.camel}Router\n`;\n}\n"]}
+{"version":3,"file":"router-template.js","sourceRoot":"","sources":["../../../../../../../src/utils/cli/utils/template-generator/templates/router-template.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,oBAAoB,GACrB,MAAM,gCAAgC,CAAC;AAGxC,MAAM,UAAU,sBAAsB,CAAC,OAAwB;IAC7D,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAEvC,IAAI,CAAC,SAAS;QACZ,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;IAEjE,MAAM,GAAG,GAAG,oBAAoB,EAAE,CAAC;IACnC,MAAM,cAAc,GAClB,OAAO,EAAE,UAAU,IAAI,KAAK,SAAS,CAAC,KAAK,eAAe,GAAG,EAAE,CAAC;IAElE,MAAM,kBAAkB,GAAG,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC;IAChE,MAAM,wBAAwB,GAC5B,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,sCAAsC,CAAC,CAAC,CAAC,EAAE,CAAC;IAE7D,MAAM,gBAAgB,GAAG,eAAe,CAAC,cAAc,CAAC,CAAC;IAEzD,MAAM,oBAAoB,GAAG,gBAAgB;QAC3C,CAAC,CAAC,UAAU,SAAS,CAAC,KAAK,oBACvB,OAAO,EAAE,UAAU;YACnB,KAAK,SAAS,CAAC,KAAK,cAAc,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,EAClE,GAAG;QACL,CAAC,CAAC,UAAU,SAAS,CAAC,KAAK,oBACvB,OAAO,EAAE,UAAU;YACnB,KAAK,SAAS,CAAC,KAAK,cAAc,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,EAClE,GAAG,CAAC;IAER,MAAM,qBAAqB,GAAG,GAAG,SAAS,CAAC,KAAK,wBAAwB,CAAC;IAEzE,OAAO;EACP,oBAAoB;EACpB,wBAAwB;;qBAEL,kBAAkB;;QAE/B,SAAS,CAAC,KAAK;;EAErB,SAAS,CAAC,KAAK;;;2DAG0C,SAAS,CAAC,KAAK;;;;IAItE,qBAAqB;;;iBAGR,SAAS,CAAC,KAAK;CAC/B,CAAC;AACF,CAAC","sourcesContent":["import {\n  checkFileExists,\n  getUserFileExtension,\n} from \"../../../../helpers/fs.helpers\";\nimport { TemplateOptions } from \"../../template-generators\";\n\nexport function generateRouterTemplate(options: TemplateOptions): string {\n  const { modelName, imports } = options;\n\n  if (!modelName)\n    throw new Error(\"Module name is required for router template\");\n\n  const ext = getUserFileExtension();\n  const controllerPath =\n    imports?.controller || `./${modelName.kebab}.controller.${ext}`;\n\n  const routerConfigTsType = ext === \"ts\" ? \": RouterConfig\" : \"\";\n  const routerConfigTsTypeImport =\n    ext === \"ts\" ? \"import { RouterConfig } from 'arkos'\" : \"\";\n\n  const controllerExists = checkFileExists(controllerPath);\n\n  const controllerImportLine = controllerExists\n    ? `import ${modelName.camel}Controller from \"${\n        imports?.controller ||\n        `./${modelName.kebab}.controller${ext === \"js\" ? \".\" + \"js\" : \"\"}`\n      }\"`\n    : `import ${modelName.camel}Controller from \"${\n        imports?.controller ||\n        `./${modelName.kebab}.controller${ext === \"js\" ? \".\" + \"js\" : \"\"}`\n      }\"`;\n\n  const controllerHandlerLine = `${modelName.camel}Controller.someHandler`;\n\n  return `import { ArkosRouter } from 'arkos'\n${controllerImportLine}\n${routerConfigTsTypeImport}\n\nexport const config${routerConfigTsType} = { }\n\nconst ${modelName.camel}Router = ArkosRouter()\n\n${modelName.camel}Router.get(\n  {\n    route: \"/custom-endpoint\",\n    authentication: { action: \"CustomAction\", resource: \"${modelName.kebab}\" },\n    validation: {},\n    openapi: {}\n  },\n  ${controllerHandlerLine}\n)\n\nexport default ${modelName.camel}Router\n`;\n}\n"]}

package/dist/types/exports/index.d.ts

@@ -2,10 +2,11 @@ import { RouterConfig } from "../types/router-config";
 import { BaseController } from "./../modules/base/base.controller";
 import { initApp, getArkosConfig } from "../server";
 import ArkosRouter from "../utils/arkos-router";
+import { ArkosRouteConfig } from "../utils/arkos-router/types";
 import { ArkosRequest, ArkosResponse, ArkosNextFunction, ArkosRequestHandler } from "../types";
 import { ArkosConfig } from "../types/arkos-config";
 declare const arkos: {
     init: typeof initApp;
 };
-export { ArkosRequest, ArkosResponse, ArkosNextFunction, ArkosRequestHandler, BaseController, ArkosConfig, RouterConfig, getArkosConfig, ArkosRouter, };
+export { ArkosRequest, ArkosResponse, ArkosNextFunction, ArkosRequestHandler, BaseController, ArkosConfig, RouterConfig, getArkosConfig, ArkosRouter, ArkosRouteConfig, };
 export default arkos;

package/dist/types/modules/base/base.middlewares.d.ts

@@ -12,4 +12,4 @@ export declare function addPrismaQueryOptionsToRequest<T extends Record<string,
 export declare function handleRequestLogs(req: Request, res: Response, next: NextFunction): void;
 export declare function handleRequestBodyValidationAndTransformation<T extends object>(schemaOrDtoClass?: ClassConstructor<T>, classValidatorValidationOptions?: ValidatorOptions): ArkosRequestHandler;
 export declare function handleRequestBodyValidationAndTransformation<T extends object>(schemaOrDtoClass?: ZodSchema<T>): ArkosRequestHandler;
-export declare function validateRequestInputs(validators: ArkosRouteConfig["validation"]): any;
+export declare function validateRequestInputs(validationRouteConfig: Pick<ArkosRouteConfig, "validation">): any;

package/dist/types/utils/arkos-router/types/index.d.ts

@@ -1,7 +1,7 @@
 import { ErrorRequestHandler, IRouter, RequestHandler } from "express";
 import { OpenAPIV3 } from "openapi-types";
 import { ZodSchema } from "zod";
-type MethodHandler = (configOrPath: string | ArkosRouteConfig, ...handlers: (RequestHandler | ErrorRequestHandler)[]) => IArkosRouter;
+type MethodHandler = (configOrPath: ArkosRouteConfig, ...handlers: (RequestHandler | ErrorRequestHandler)[]) => IArkosRouter;
 export interface IArkosRouter extends Omit<IRouter, "get" | "post" | "put" | "patch" | "delete" | "options" | "head" | "trace" | "all"> {
     get: MethodHandler;
     post: MethodHandler;
@@ -20,7 +20,7 @@ export interface ArkosRouteConfig {
         action: string;
         rule?: any;
     };
-    validation?: {
+    validation?: undefined | {
         query?: ZodSchema | (new (...args: any[]) => object) | undefined;
         body?: ZodSchema | (new (...args: any[]) => object) | undefined;
         params?: ZodSchema | (new (...args: any[]) => object) | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arkos",
-  "version": "1.4.0-canary.6",
+  "version": "1.4.0-canary.7",
   "description": "The Express & Prisma RESTful Framework",
   "main": "dist/cjs/exports/index.js",
   "module": "dist/esm/exports/index.js",