arkos 1.4.1-canary.1 → 1.4.1-canary.11

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 {\n  extractArkosRoutes,\n  extractPathParams,\n  getMiddlewareStack,\n} from \"./utils/helpers\";\nimport { getArkosConfig } from \"../../exports\";\nimport { catchAsync } from \"../../exports/error-handler\";\nimport { ArkosErrorRequestHandler, ArkosRequestHandler } from \"../../types\";\nimport zodToJsonSchema from \"zod-to-json-schema\";\nimport classValidatorToJsonSchema from \"../../modules/swagger/utils/helpers/class-validator-to-json-schema\";\nimport openApiSchemaConverter from \"../../modules/swagger/utils/helpers/openapi-schema-converter\";\nimport uploadManager from \"./utils/helpers/upload-manager\";\nimport { getUserFileExtension } from \"../helpers/fs.helpers\";\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 *     path: \"/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 = 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      type ArkosAnyRequestHandler =\n        | ArkosRequestHandler\n        | ArkosErrorRequestHandler;\n\n      if (httpMethods.includes(prop as string)) {\n        return function (\n          config: ArkosRouteConfig,\n          ...handlers: ArkosAnyRequestHandler[]\n        ) {\n          if (config.disabled) return;\n\n          const path = config.path;\n\n          if (!RouteConfigValidator.isArkosRouteConfig(config))\n            throw Error(\n              `First argument of ArkosRouter().${prop as string}() must be a valid ArkosRouteConfig object with path field, but recevied ${typeof config === \"object\" ? JSON.stringify(config, null, 2) : config}`\n            );\n\n          if ([null, undefined].includes(path as any))\n            throw Error(\n              \"Please pass valid value for path field to use in your route\"\n            );\n\n          const method = prop as string;\n\n          if (handlers.length > 0) {\n            handlers = handlers.map(\n              (handler: ArkosAnyRequestHandler | ArkosAnyRequestHandler[]) => {\n                return typeof handler === \"function\"\n                  ? catchAsync(handler, {\n                      type: handler.length > 3 ? \"error\" : \"normal\",\n                    })\n                  : handler.map((nesteHandler: any) =>\n                      catchAsync(nesteHandler, {\n                        type: handler.length > 3 ? \"error\" : \"normal\",\n                      })\n                    );\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          const strictValidation = validationConfig?.strict;\n          const route = `${method.toUpperCase()} ${path}`;\n\n          if (\n            strictValidation &&\n            (!(\"validation\" in config) ||\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 ${route} config validation option without choosing a validation resolver under arkos.init({ validation: { resolver: '' } })`\n            );\n\n          if (config.authentication && !authenticationConfig?.mode)\n            throw Error(\n              `Trying to authenticate route ${route} without choosing an authentication mode under arkos.config.${getUserFileExtension()}\n\nFor further help see https://www.arkosjs.com/docs/core-concepts/authentication-system.`\n            );\n\n          handlers = [...getMiddlewareStack(config), ...handlers];\n\n          if (\n            config.experimental?.uploads &&\n            config.experimental.uploads.deleteOnError !== false\n          )\n            handlers.push(\n              catchAsync(\n                uploadManager.handleFileCleanup(config.experimental.uploads),\n                { type: \"error\" }\n              )\n            );\n\n          return originalMethod.call(target, path, ...handlers);\n        };\n      }\n      // }\n      return originalMethod;\n    },\n  }) as IArkosRouter;\n}\n\nexport function generateOpenAPIFromApp(app: any) {\n  const routes = extractArkosRoutes(app);\n  const arkosConfig = getArkosConfig();\n\n  let paths: Record<\n    string,\n    Record<string, Partial<OpenAPIV3.OperationObject>>\n  > = {};\n\n  routes.forEach(({ path, method, config }) => {\n    if (config?.experimental?.openapi === false) return;\n    const originalPath = path;\n\n    const pathParatemersFromRoutePath = extractPathParams(path);\n    for (const parameter of pathParatemersFromRoutePath) {\n      path = path.replaceAll(\n        `:${parameter}`,\n        parameter.endsWith(\"?\") ? `{${parameter}}?` : `{${parameter}}`\n      );\n    }\n\n    if (!paths[path]) paths[path] = {};\n\n    if (typeof config?.experimental?.openapi === \"boolean\") {\n      config = {\n        ...config,\n        experimental: {\n          ...config.experimental,\n          openapi: {},\n        },\n      };\n    }\n\n    const openapi =\n      typeof config?.experimental?.openapi === \"object\" &&\n      config.experimental.openapi !== null\n        ? config.experimental.openapi\n        : {};\n\n    const validatorToJsonSchema =\n      arkosConfig?.validation?.resolver === \"zod\"\n        ? zodToJsonSchema\n        : classValidatorToJsonSchema;\n\n    let parameters = [];\n    const validationToParameterMapping = {\n      query: \"query\",\n      params: \"path\",\n      headers: \"header\",\n      cookies: \"cookie\",\n    };\n\n    if (typeof config?.validation !== \"boolean\" && config?.validation) {\n      for (const [key, val] of Object.entries(config?.validation)) {\n        if ([\"body\"].includes(key)) continue;\n        if ((config?.validation as any)[key]) {\n          const jsonSchema = validatorToJsonSchema(val as any);\n          const params = openApiSchemaConverter.jsonSchemaToOpeApiParameters(\n            (validationToParameterMapping as any)[key],\n            jsonSchema\n          );\n          parameters.push(...params);\n        }\n      }\n    }\n\n    const convertedOpenAPI =\n      openApiSchemaConverter.convertOpenAPIConfig(openapi);\n\n    const allParameters: OpenAPIV3.ParameterObject[] = [\n      ...(convertedOpenAPI.parameters || []),\n      ...parameters,\n    ];\n\n    for (const parameter of pathParatemersFromRoutePath) {\n      if (\n        !allParameters.find(\n          ({ name, in: paramIn }) =>\n            name === parameter.replace(\"?\", \"\") && paramIn === \"path\"\n        )\n      )\n        allParameters.push({\n          name: parameter,\n          in: \"path\",\n          required: !parameter.includes(\"?\"),\n          schema: { type: \"string\" },\n        });\n    }\n\n    for (const param of allParameters) {\n      if (\n        !pathParatemersFromRoutePath.includes(param.name) &&\n        !pathParatemersFromRoutePath.includes(`${param.name}?`)\n      )\n        throw new Error(\n          `ValidationError: Trying to define path parameter '${param.name}' but it is not present in your pathname ${originalPath}`\n        );\n    }\n\n    delete convertedOpenAPI.parameters;\n\n    (paths as any)[path][method.toLowerCase()] = {\n      summary: openapi?.summary || `${path}`,\n      description: openapi?.description || `${method} ${path}`,\n      tags: openapi?.tags || [\"Defaults\"],\n      operationId: `${method.toLowerCase()}:${path}`,\n      parameters: allParameters,\n      ...(!convertedOpenAPI.requestBody &&\n        config?.validation &&\n        config?.validation?.body && {\n          requestBody: {\n            content: {\n              \"application/json\": {\n                schema: validatorToJsonSchema(config?.validation?.body as any),\n              },\n            },\n          },\n        }),\n      ...convertedOpenAPI,\n    };\n  });\n\n  return paths;\n}\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/utils/arkos-router/index.ts"],"names":[],"mappings":";;;;;AA2CA,8BA4HC;AAED,wDA4HC;AArSD,qCAAgD;AAGhD,sFAA4D;AAC5D,oFAA0D;AAC1D,6CAIyB;AACzB,2CAA+C;AAC/C,+DAAyD;AAEzD,4EAAiD;AACjD,wIAA4G;AAC5G,4HAAkG;AAClG,oFAA2D;AAC3D,sDAA6D;AA0B7D,SAAwB,WAAW,CAAC,OAAuB;IACzD,MAAM,MAAM,GAAG,IAAA,gBAAM,EAAC,OAAO,CAAC,CAAC;IAE/B,OAAO,IAAI,KAAK,CAAC,MAAM,EAAE;QACvB,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,QAAQ;YACxB,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;YAE3D,MAAM,WAAW,GAAG;gBAClB,KAAK;gBACL,MAAM;gBACN,KAAK;gBACL,OAAO;gBACP,QAAQ;gBACR,KAAK;gBACL,MAAM;gBACN,OAAO;gBACP,SAAS;aACV,CAAC;YAMF,IAAI,WAAW,CAAC,QAAQ,CAAC,IAAc,CAAC,EAAE,CAAC;gBACzC,OAAO,UACL,MAAwB,EACxB,GAAG,QAAkC;oBAErC,IAAI,MAAM,CAAC,QAAQ;wBAAE,OAAO;oBAE5B,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;oBAEzB,IAAI,CAAC,gCAAoB,CAAC,kBAAkB,CAAC,MAAM,CAAC;wBAClD,MAAM,KAAK,CACT,mCAAmC,IAAc,4EAA4E,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CACrM,CAAC;oBAEJ,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC,IAAW,CAAC;wBACzC,MAAM,KAAK,CACT,6DAA6D,CAC9D,CAAC;oBAEJ,MAAM,MAAM,GAAG,IAAc,CAAC;oBAC9B,MAAM,qBAAqB,GAAG,CAAC,OAAY,EAAE,EAAE,CAC7C,KAAK,CACH,oCAAoC,MAAM,CAAC,WAAW,EAAE,IAAI,IAAI,cAAc,OAAO,GAAG,CACzF,CAAC;oBAEJ,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;wBACxB,QAAQ,GAAG,QAAQ,CAAC,GAAG,CACrB,CAAC,OAA0D,EAAE,EAAE;4BAC7D,IAAI,CAAC,OAAO;gCAAE,MAAM,qBAAqB,CAAC,OAAO,CAAC,CAAC;4BAEnD,OAAO,OAAO,OAAO,KAAK,UAAU;gCAClC,CAAC,CAAC,IAAA,0BAAU,EAAC,OAAO,EAAE;oCAClB,IAAI,EAAE,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ;iCAC9C,CAAC;gCACJ,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC;oCACtB,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,YAAiB,EAAE,EAAE;wCAChC,IAAI,CAAC,OAAO;4CAAE,MAAM,qBAAqB,CAAC,YAAY,CAAC,CAAC;wCAExD,IAAI,OAAO,YAAY,KAAK,UAAU;4CAAE,OAAO;wCAC/C,IAAA,0BAAU,EAAC,YAAY,EAAE;4CACvB,IAAI,EAAE,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ;yCAC9C,CAAC,CAAC;wCACH,OAAO,YAAY,CAAC;oCACtB,CAAC,CAAC;oCACJ,CAAC,CAAC,OAAO,CAAC;wBAChB,CAAC,CACF,CAAC;wBAEF,MAAM,YAAY,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;wBACnD,+BAAmB,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;oBAC7D,CAAC;oBAED,MAAM,WAAW,GAAG,IAAA,wBAAc,GAAE,CAAC;oBACrC,MAAM,gBAAgB,GAAG,WAAW,CAAC,UAAU,CAAC;oBAChD,MAAM,oBAAoB,GAAG,WAAW,CAAC,cAAc,CAAC;oBACxD,MAAM,gBAAgB,GAAG,gBAAgB,EAAE,MAAM,CAAC;oBAClD,MAAM,KAAK,GAAG,GAAG,MAAM,CAAC,WAAW,EAAE,IAAI,IAAI,EAAE,CAAC;oBAEhD,IACE,gBAAgB;wBAChB,CAAC,CAAC,CAAC,YAAY,IAAI,MAAM,CAAC;4BACxB,CAAC,YAAY,IAAI,MAAM;gCACrB,CAAC,MAAM,CAAC,UAAU;gCAClB,MAAM,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC;wBAErC,MAAM,KAAK,CACT,yQAAyQ,CAC1Q,CAAC;oBAEJ,IAAI,CAAC,gBAAgB,EAAE,QAAQ,IAAI,MAAM,CAAC,UAAU;wBAClD,MAAM,KAAK,CACT,wCAAwC,KAAK,qHAAqH,CACnK,CAAC;oBAEJ,IAAI,MAAM,CAAC,cAAc,IAAI,CAAC,oBAAoB,EAAE,IAAI;wBACtD,MAAM,KAAK,CACT,gCAAgC,KAAK,+DAA+D,IAAA,iCAAoB,GAAE;;uFAEjD,CAC1E,CAAC;oBAEJ,QAAQ,GAAG,CAAC,GAAG,IAAA,4BAAkB,EAAC,MAAM,CAAC,EAAE,GAAG,QAAQ,CAAC,CAAC;oBAExD,IACE,MAAM,CAAC,YAAY,EAAE,OAAO;wBAC5B,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,aAAa,KAAK,KAAK;wBAEnD,QAAQ,CAAC,IAAI,CACX,IAAA,0BAAU,EACR,wBAAa,CAAC,iBAAiB,CAAC,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,EAC5D,EAAE,IAAI,EAAE,OAAO,EAAE,CAClB,CACF,CAAC;oBAEJ,OAAO,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,QAAQ,CAAC,CAAC;gBACxD,CAAC,CAAC;YACJ,CAAC;YAED,OAAO,cAAc,CAAC;QACxB,CAAC;KACF,CAAiB,CAAC;AACrB,CAAC;AAED,SAAgB,sBAAsB,CAAC,GAAQ;IAC7C,MAAM,MAAM,GAAG,IAAA,4BAAkB,EAAC,GAAG,CAAC,CAAC;IACvC,MAAM,WAAW,GAAG,IAAA,wBAAc,GAAE,CAAC;IAErC,IAAI,KAAK,GAGL,EAAE,CAAC;IAEP,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE;QAC1C,IAAI,MAAM,EAAE,YAAY,EAAE,OAAO,KAAK,KAAK;YAAE,OAAO;QACpD,MAAM,YAAY,GAAG,IAAI,CAAC;QAE1B,MAAM,2BAA2B,GAAG,IAAA,2BAAiB,EAAC,IAAI,CAAC,CAAC;QAC5D,KAAK,MAAM,SAAS,IAAI,2BAA2B,EAAE,CAAC;YACpD,IAAI,GAAG,IAAI,CAAC,UAAU,CACpB,IAAI,SAAS,EAAE,EACf,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,SAAS,IAAI,CAAC,CAAC,CAAC,IAAI,SAAS,GAAG,CAC/D,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;YAAE,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;QAEnC,IAAI,OAAO,MAAM,EAAE,YAAY,EAAE,OAAO,KAAK,SAAS,EAAE,CAAC;YACvD,MAAM,GAAG;gBACP,GAAG,MAAM;gBACT,YAAY,EAAE;oBACZ,GAAG,MAAM,CAAC,YAAY;oBACtB,OAAO,EAAE,EAAE;iBACZ;aACF,CAAC;QACJ,CAAC;QAED,MAAM,OAAO,GACX,OAAO,MAAM,EAAE,YAAY,EAAE,OAAO,KAAK,QAAQ;YACjD,MAAM,CAAC,YAAY,CAAC,OAAO,KAAK,IAAI;YAClC,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,OAAO;YAC7B,CAAC,CAAC,EAAE,CAAC;QAET,MAAM,qBAAqB,GACzB,WAAW,EAAE,UAAU,EAAE,QAAQ,KAAK,KAAK;YACzC,CAAC,CAAC,4BAAe;YACjB,CAAC,CAAC,wCAA0B,CAAC;QAEjC,IAAI,UAAU,GAAG,EAAE,CAAC;QACpB,MAAM,4BAA4B,GAAG;YACnC,KAAK,EAAE,OAAO;YACd,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,QAAQ;YACjB,OAAO,EAAE,QAAQ;SAClB,CAAC;QAEF,IAAI,OAAO,MAAM,EAAE,UAAU,KAAK,SAAS,IAAI,MAAM,EAAE,UAAU,EAAE,CAAC;YAClE,KAAK,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,UAAU,CAAC,EAAE,CAAC;gBAC5D,IAAI,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC;oBAAE,SAAS;gBACrC,IAAI,CAAC,MAAM,EAAE,UAAkB,CAAA,CAAC,GAAG,CAAC,EAAE,CAAC;oBACrC,MAAM,UAAU,GAAG,qBAAqB,CAAC,GAAU,CAAC,CAAC;oBACrD,MAAM,MAAM,GAAG,kCAAsB,CAAC,4BAA4B,CAC/D,4BAAoC,CAAC,GAAG,CAAC,EAC1C,UAAU,CACX,CAAC;oBACF,UAAU,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC;gBAC7B,CAAC;YACH,CAAC;QACH,CAAC;QAED,MAAM,gBAAgB,GACpB,kCAAsB,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;QAEvD,MAAM,aAAa,GAAgC;YACjD,GAAG,CAAC,gBAAgB,CAAC,UAAU,IAAI,EAAE,CAAC;YACtC,GAAG,UAAU;SACd,CAAC;QAEF,KAAK,MAAM,SAAS,IAAI,2BAA2B,EAAE,CAAC;YACpD,IACE,CAAC,aAAa,CAAC,IAAI,CACjB,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CACxB,IAAI,KAAK,SAAS,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,OAAO,KAAK,MAAM,CAC5D;gBAED,aAAa,CAAC,IAAI,CAAC;oBACjB,IAAI,EAAE,SAAS;oBACf,EAAE,EAAE,MAAM;oBACV,QAAQ,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC;oBAClC,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;iBAC3B,CAAC,CAAC;QACP,CAAC;QAED,KAAK,MAAM,KAAK,IAAI,aAAa,EAAE,CAAC;YAClC,IACE,CAAC,2BAA2B,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC;gBACjD,CAAC,2BAA2B,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC,IAAI,GAAG,CAAC;gBACvD,KAAK,CAAC,EAAE,KAAK,MAAM;gBAEnB,MAAM,IAAI,KAAK,CACb,qDAAqD,KAAK,CAAC,IAAI,4CAA4C,YAAY,EAAE,CAC1H,CAAC;QACN,CAAC;QAED,OAAO,gBAAgB,CAAC,UAAU,CAAC;QAElC,KAAa,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,GAAG;YAC3C,OAAO,EAAE,OAAO,EAAE,OAAO,IAAI,GAAG,IAAI,EAAE;YACtC,WAAW,EAAE,OAAO,EAAE,WAAW,IAAI,GAAG,MAAM,IAAI,IAAI,EAAE;YACxD,IAAI,EAAE,OAAO,EAAE,IAAI,IAAI,CAAC,UAAU,CAAC;YACnC,WAAW,EAAE,GAAG,MAAM,CAAC,WAAW,EAAE,IAAI,IAAI,EAAE;YAC9C,UAAU,EAAE,aAAa;YACzB,GAAG,CAAC,CAAC,gBAAgB,CAAC,WAAW;gBAC/B,MAAM,EAAE,UAAU;gBAClB,MAAM,EAAE,UAAU,EAAE,IAAI,IAAI;gBAC1B,WAAW,EAAE;oBACX,OAAO,EAAE;wBACP,kBAAkB,EAAE;4BAClB,MAAM,EAAE,qBAAqB,CAAC,MAAM,EAAE,UAAU,EAAE,IAAW,CAAC;yBAC/D;qBACF;iBACF;aACF,CAAC;YACJ,GAAG,gBAAgB;SACpB,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,OAAO,KAAK,CAAC;AACf,CAAC","sourcesContent":["import { Router, RouterOptions } 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 {\n  extractArkosRoutes,\n  extractPathParams,\n  getMiddlewareStack,\n} from \"./utils/helpers\";\nimport { getArkosConfig } from \"../../exports\";\nimport { catchAsync } from \"../../exports/error-handler\";\nimport { ArkosErrorRequestHandler, ArkosRequestHandler } from \"../../types\";\nimport zodToJsonSchema from \"zod-to-json-schema\";\nimport classValidatorToJsonSchema from \"../../modules/swagger/utils/helpers/class-validator-to-json-schema\";\nimport openApiSchemaConverter from \"../../modules/swagger/utils/helpers/openapi-schema-converter\";\nimport uploadManager from \"./utils/helpers/upload-manager\";\nimport { getUserFileExtension } from \"../helpers/fs.helpers\";\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 *     path: \"/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(options?: RouterOptions): IArkosRouter {\n  const router = Router(options);\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      type ArkosAnyRequestHandler =\n        | ArkosRequestHandler\n        | ArkosErrorRequestHandler;\n\n      if (httpMethods.includes(prop as string)) {\n        return function (\n          config: ArkosRouteConfig,\n          ...handlers: ArkosAnyRequestHandler[]\n        ) {\n          if (config.disabled) return;\n\n          const path = config.path;\n\n          if (!RouteConfigValidator.isArkosRouteConfig(config))\n            throw Error(\n              `First argument of ArkosRouter().${prop as string}() must be a valid ArkosRouteConfig object with path field, but recevied ${typeof config === \"object\" ? JSON.stringify(config, null, 2) : config}`\n            );\n\n          if ([null, undefined].includes(path as any))\n            throw Error(\n              \"Please pass valid value for path field to use in your route\"\n            );\n\n          const method = prop as string;\n          const UndefinedHandlerError = (handler: any) =>\n            Error(\n              `Wrong value for handler in route ${method.toUpperCase()} ${path}, recevied ${handler}.`\n            );\n\n          if (handlers.length > 0) {\n            handlers = handlers.map(\n              (handler: ArkosAnyRequestHandler | ArkosAnyRequestHandler[]) => {\n                if (!handler) throw UndefinedHandlerError(handler);\n\n                return typeof handler === \"function\"\n                  ? catchAsync(handler, {\n                      type: handler.length > 3 ? \"error\" : \"normal\",\n                    })\n                  : Array.isArray(handler)\n                    ? handler.map((nesteHandler: any) => {\n                        if (!handler) throw UndefinedHandlerError(nesteHandler);\n\n                        if (typeof nesteHandler === \"function\") return;\n                        catchAsync(nesteHandler, {\n                          type: handler.length > 3 ? \"error\" : \"normal\",\n                        });\n                        return nesteHandler;\n                      })\n                    : handler;\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          const strictValidation = validationConfig?.strict;\n          const route = `${method.toUpperCase()} ${path}`;\n\n          if (\n            strictValidation &&\n            (!(\"validation\" in config) ||\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 ${route} config validation option without choosing a validation resolver under arkos.init({ validation: { resolver: '' } })`\n            );\n\n          if (config.authentication && !authenticationConfig?.mode)\n            throw Error(\n              `Trying to authenticate route ${route} without choosing an authentication mode under arkos.config.${getUserFileExtension()}\n\nFor further help see https://www.arkosjs.com/docs/core-concepts/authentication-system.`\n            );\n\n          handlers = [...getMiddlewareStack(config), ...handlers];\n\n          if (\n            config.experimental?.uploads &&\n            config.experimental.uploads.deleteOnError !== false\n          )\n            handlers.push(\n              catchAsync(\n                uploadManager.handleFileCleanup(config.experimental.uploads),\n                { type: \"error\" }\n              )\n            );\n\n          return originalMethod.call(target, path, ...handlers);\n        };\n      }\n      // }\n      return originalMethod;\n    },\n  }) as IArkosRouter;\n}\n\nexport function generateOpenAPIFromApp(app: any) {\n  const routes = extractArkosRoutes(app);\n  const arkosConfig = getArkosConfig();\n\n  let paths: Record<\n    string,\n    Record<string, Partial<OpenAPIV3.OperationObject>>\n  > = {};\n\n  routes.forEach(({ path, method, config }) => {\n    if (config?.experimental?.openapi === false) return;\n    const originalPath = path;\n\n    const pathParatemersFromRoutePath = extractPathParams(path);\n    for (const parameter of pathParatemersFromRoutePath) {\n      path = path.replaceAll(\n        `:${parameter}`,\n        parameter.endsWith(\"?\") ? `{${parameter}}?` : `{${parameter}}`\n      );\n    }\n\n    if (!paths[path]) paths[path] = {};\n\n    if (typeof config?.experimental?.openapi === \"boolean\") {\n      config = {\n        ...config,\n        experimental: {\n          ...config.experimental,\n          openapi: {},\n        },\n      };\n    }\n\n    const openapi =\n      typeof config?.experimental?.openapi === \"object\" &&\n      config.experimental.openapi !== null\n        ? config.experimental.openapi\n        : {};\n\n    const validatorToJsonSchema =\n      arkosConfig?.validation?.resolver === \"zod\"\n        ? zodToJsonSchema\n        : classValidatorToJsonSchema;\n\n    let parameters = [];\n    const validationToParameterMapping = {\n      query: \"query\",\n      params: \"path\",\n      headers: \"header\",\n      cookies: \"cookie\",\n    };\n\n    if (typeof config?.validation !== \"boolean\" && config?.validation) {\n      for (const [key, val] of Object.entries(config?.validation)) {\n        if ([\"body\"].includes(key)) continue;\n        if ((config?.validation as any)[key]) {\n          const jsonSchema = validatorToJsonSchema(val as any);\n          const params = openApiSchemaConverter.jsonSchemaToOpeApiParameters(\n            (validationToParameterMapping as any)[key],\n            jsonSchema\n          );\n          parameters.push(...params);\n        }\n      }\n    }\n\n    const convertedOpenAPI =\n      openApiSchemaConverter.convertOpenAPIConfig(openapi);\n\n    const allParameters: OpenAPIV3.ParameterObject[] = [\n      ...(convertedOpenAPI.parameters || []),\n      ...parameters,\n    ];\n\n    for (const parameter of pathParatemersFromRoutePath) {\n      if (\n        !allParameters.find(\n          ({ name, in: paramIn }) =>\n            name === parameter.replace(\"?\", \"\") && paramIn === \"path\"\n        )\n      )\n        allParameters.push({\n          name: parameter,\n          in: \"path\",\n          required: !parameter.includes(\"?\"),\n          schema: { type: \"string\" },\n        });\n    }\n\n    for (const param of allParameters) {\n      if (\n        !pathParatemersFromRoutePath.includes(param.name) &&\n        !pathParatemersFromRoutePath.includes(`${param.name}?`) &&\n        param.in === \"path\"\n      )\n        throw new Error(\n          `ValidationError: Trying to define path parameter '${param.name}' but it is not present in your pathname ${originalPath}`\n        );\n    }\n\n    delete convertedOpenAPI.parameters;\n\n    (paths as any)[path][method.toLowerCase()] = {\n      summary: openapi?.summary || `${path}`,\n      description: openapi?.description || `${method} ${path}`,\n      tags: openapi?.tags || [\"Defaults\"],\n      operationId: `${method.toLowerCase()}:${path}`,\n      parameters: allParameters,\n      ...(!convertedOpenAPI.requestBody &&\n        config?.validation &&\n        config?.validation?.body && {\n          requestBody: {\n            content: {\n              \"application/json\": {\n                schema: validatorToJsonSchema(config?.validation?.body as any),\n              },\n            },\n          },\n        }),\n      ...convertedOpenAPI,\n    };\n  });\n\n  return paths;\n}\n"]}

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

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.devCommand = devCommand;
 exports.killDevelopmentServerChildProcess = killDevelopmentServerChildProcess;
 const child_process_1 = require("child_process");
-const chokidar_1 = __importDefault(require("chokidar"));
 const fs_helpers_1 = require("../helpers/fs.helpers");
 const dotenv_helpers_1 = require("../dotenv.helpers");
 const fs_1 = __importDefault(require("fs"));
@@ -25,12 +24,11 @@ async function devCommand(options = {}) {
     try {
         const { port, host } = options;
         let isRestarting = false;
-        let restartingFiles = new Set();
         const fileExt = (0, fs_helpers_1.getUserFileExtension)();
         const entryPoint = path_1.default.resolve(process.cwd(), `src/app.${fileExt}`);
         if (!fs_1.default.existsSync(entryPoint)) {
             console.error(`Could not find application entry point at ${entryPoint}`);
-            process.exit(1);
+            return process.exit(1);
         }
         const baseServiceTypesPath = path_1.default.resolve(process.cwd(), `node_modules/@arkosjs/types/base.service.d.ts`);
         if (fileExt === "ts" && !fs_1.default.existsSync(baseServiceTypesPath)) {
@@ -98,52 +96,10 @@ async function devCommand(options = {}) {
                 });
             }
         };
-        const scheduleRestart = (reason, filePath) => {
-            if (filePath)
-                restartingFiles.add(filePath);
-            if (restartTimeout)
-                clearTimeout(restartTimeout);
-            const now = new Date();
-            const time = now.toTimeString().split(" ")[0];
-            isRestarting = true;
-            if (child) {
-                child.kill();
-                child = null;
-            }
-            restartTimeout = setTimeout(() => {
-                sheu_1.default.info(`\x1b[90m${time}\x1b[0m Restarting: ${reason.toLowerCase()}`);
-                startServer();
-                isRestarting = false;
-                restartTimeout = null;
-                if (filePath)
-                    restartingFiles.delete(filePath);
-            }, 1000);
-        };
-        const setupEnvWatcher = () => {
-            const envWatcher = chokidar_1.default.watch((0, fs_helpers_1.fullCleanCwd)(envFiles?.join(",") || "")
-                .replaceAll("/", "")
-                .split(",") || [], {
-                ignoreInitial: true,
-                persistent: true,
-            });
-            envWatcher.on("all", (_, filePath) => {
-                try {
-                    envFiles = (0, dotenv_helpers_1.loadEnvironmentVariables)();
-                    scheduleRestart("Environment files changed", "env-files");
-                }
-                catch (error) {
-                    console.error(`Error reloading ${filePath}:`, error);
-                }
-            });
-            return envWatcher;
-        };
         startServer();
-        const envWatcher = setupEnvWatcher();
         const cleanup = () => {
             if (restartTimeout)
                 clearTimeout(restartTimeout);
-            if (envWatcher)
-                envWatcher.close();
             if (child) {
                 child.kill("SIGTERM");
                 setTimeout(() => {

package/dist/cjs/utils/cli/dev.js.map

@@ -1 +1 @@
-{"version":3,"file":"dev.js","sourceRoot":"","sources":["../../../../src/utils/cli/dev.ts"],"names":[],"mappings":"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","sourcesContent":["import { spawn, ChildProcess, execSync } from \"child_process\";\nimport chokidar from \"chokidar\";\nimport { fullCleanCwd, getUserFileExtension } from \"../helpers/fs.helpers\";\nimport { loadEnvironmentVariables } from \"../dotenv.helpers\";\nimport fs from \"fs\";\nimport path from \"path\";\nimport sheu from \"../sheu\";\nimport portAndHostAllocator from \"../features/port-and-host-allocator\";\nimport watermarkStamper from \"./utils/watermark-stamper\";\n\ninterface DevOptions {\n  port?: string;\n  host?: string;\n}\n\nlet child: ChildProcess | null = null;\nlet envFiles: string[] | undefined;\n\n/**\n * Dev server command for the arkos CLI\n */\nexport async function devCommand(options: DevOptions = {}) {\n  if (!process.env.NODE_ENV) process.env.NODE_ENV = \"development\";\n  envFiles = loadEnvironmentVariables();\n  child = null;\n  let restartTimeout: NodeJS.Timeout | null = null;\n\n  try {\n    const { port, host } = options;\n    let isRestarting = false;\n    let restartingFiles = new Set<string>();\n\n    const fileExt = getUserFileExtension();\n    const entryPoint = path.resolve(process.cwd(), `src/app.${fileExt}`);\n\n    if (!fs.existsSync(entryPoint)) {\n      console.error(`Could not find application entry point at ${entryPoint}`);\n      process.exit(1);\n    }\n\n    const baseServiceTypesPath = path.resolve(\n      process.cwd(),\n      `node_modules/@arkosjs/types/base.service.d.ts`\n    );\n    if (fileExt === \"ts\" && !fs.existsSync(baseServiceTypesPath)) {\n      const answer = await new Promise<boolean>((resolve) => {\n        sheu.warn(\n          'Missing base services types please run \"npx arkos prisma generate\" to generate and sync the types from @prisma/client'\n        );\n        process.stdout.write(\n          `\\n${sheu.green(\"?\", { bold: true })} Would you like to run \"npx arkos prisma generate\"? (Y/n): `\n        );\n        process.stdin.once(\"data\", (data) => {\n          const result = data.toString().trim().toLowerCase();\n          process.stdin.pause();\n          resolve(result === \"y\" || result.length === 0);\n        });\n      });\n\n      if (answer) {\n        console.info(\"\\nSyncing base service with @prisma/client...\");\n        console.log(\"\");\n        execSync(`npx arkos prisma generate`);\n      } else\n        throw Error(\n          'Missing BaseService types please run \"npx arkos prisma generate\" to generate and sync the types from @prisma/client, see more at https://www.arkosjs.com/docs/cli/built-in-cli#typescript-types-generation.'\n        );\n    }\n\n    const getEnv = () =>\n      ({\n        NODE_ENV: \"development\",\n        ...process.env,\n        ...(port && { CLI_PORT: port }),\n        ...(host && { CLI_HOST: host }),\n        CLI: \"false\",\n      }) as { [x: string]: string };\n\n    const env = getEnv();\n    const hostAndPort = await portAndHostAllocator.getHostAndAvailablePort(\n      env,\n      { logWarning: true }\n    );\n\n    watermarkStamper.stamp({\n      ...hostAndPort,\n      envFiles,\n    });\n\n    process.env.__PORT = hostAndPort.port || \"\";\n    process.env.__HOST = hostAndPort.host || \"\";\n\n    const startServer = () => {\n      if (child) {\n        child.kill();\n        child = null;\n      }\n\n      const env = getEnv();\n\n      if (fileExt === \"ts\") {\n        child = spawn(\"npx\", [\"tsx-strict\", \"--watch\", entryPoint], {\n          stdio: \"inherit\",\n          env,\n          shell: true,\n        });\n      } else {\n        child = spawn(\n          \"npx\",\n          [\"tsx-strict\", \"--no-type-check\", \"--watch\", entryPoint],\n          {\n            stdio: \"inherit\",\n            env,\n            shell: true,\n          }\n        );\n      }\n\n      if (child) {\n        child.on(\"error\", (error) => {\n          console.error(\"Failed to start server:\", error);\n        });\n\n        child.on(\"exit\", (code, signal) => {\n          if (!isRestarting && signal !== \"SIGTERM\" && signal !== \"SIGINT\") {\n            console.info(`Server exited with code ${code}, restarting...`);\n            startServer();\n          }\n        });\n      }\n    };\n\n    const scheduleRestart = (reason: string, filePath?: string) => {\n      if (filePath) restartingFiles.add(filePath);\n\n      if (restartTimeout) clearTimeout(restartTimeout);\n      const now = new Date();\n      const time = now.toTimeString().split(\" \")[0];\n\n      isRestarting = true;\n      if (child) {\n        child.kill();\n        child = null;\n      }\n\n      restartTimeout = setTimeout(() => {\n        sheu.info(`\\x1b[90m${time}\\x1b[0m Restarting: ${reason.toLowerCase()}`);\n        startServer();\n        isRestarting = false;\n        restartTimeout = null;\n        if (filePath) restartingFiles.delete(filePath);\n      }, 1000);\n    };\n\n    const setupEnvWatcher = () => {\n      const envWatcher = chokidar.watch(\n        fullCleanCwd(envFiles?.join(\",\") || \"\")\n          .replaceAll(\"/\", \"\")\n          .split(\",\") || [],\n        {\n          ignoreInitial: true,\n          persistent: true,\n        }\n      );\n\n      envWatcher.on(\"all\", (_, filePath) => {\n        try {\n          envFiles = loadEnvironmentVariables();\n          scheduleRestart(\"Environment files changed\", \"env-files\");\n        } catch (error) {\n          console.error(`Error reloading ${filePath}:`, error);\n        }\n      });\n\n      return envWatcher;\n    };\n\n    startServer();\n\n    const envWatcher = setupEnvWatcher();\n\n    const cleanup = () => {\n      if (restartTimeout) clearTimeout(restartTimeout);\n\n      if (envWatcher) envWatcher.close();\n\n      if (child) {\n        child.kill(\"SIGTERM\");\n\n        setTimeout(() => {\n          if (child && !child.killed) child.kill(\"SIGKILL\");\n        }, 5000);\n      }\n\n      process.exit(0);\n    };\n\n    process.on(\"SIGINT\", cleanup);\n    process.on(\"SIGTERM\", cleanup);\n\n    process.on(\"uncaughtException\", (error) => {\n      console.error(\"Uncaught Exception:\", error);\n      cleanup();\n    });\n  } catch (error) {\n    sheu.error(\"Development server failed to start:\");\n    console.error(error);\n\n    if (child) {\n      (child as ChildProcess)?.kill?.();\n      child = null;\n    }\n\n    process.exit(1);\n  }\n}\n\n/**\n * Help function to help other processes to terminate the development server child process\n */\nexport function killDevelopmentServerChildProcess() {\n  (child as ChildProcess)?.kill?.();\n  child = null;\n}\n"]}
+{"version":3,"file":"dev.js","sourceRoot":"","sources":["../../../../src/utils/cli/dev.ts"],"names":[],"mappings":"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","sourcesContent":["import { spawn, ChildProcess, execSync } from \"child_process\";\nimport { getUserFileExtension } from \"../helpers/fs.helpers\";\nimport { loadEnvironmentVariables } from \"../dotenv.helpers\";\nimport fs from \"fs\";\nimport path from \"path\";\nimport sheu from \"../sheu\";\nimport portAndHostAllocator from \"../features/port-and-host-allocator\";\nimport watermarkStamper from \"./utils/watermark-stamper\";\n\ninterface DevOptions {\n  port?: string;\n  host?: string;\n}\n\nlet child: ChildProcess | null = null;\nlet envFiles: string[] | undefined;\n\n/**\n * Dev server command for the arkos CLI\n */\nexport async function devCommand(options: DevOptions = {}) {\n  if (!process.env.NODE_ENV) process.env.NODE_ENV = \"development\";\n  envFiles = loadEnvironmentVariables();\n  child = null;\n  let restartTimeout: NodeJS.Timeout | null = null;\n\n  try {\n    const { port, host } = options;\n    let isRestarting = false;\n\n    const fileExt = getUserFileExtension();\n    const entryPoint = path.resolve(process.cwd(), `src/app.${fileExt}`);\n\n    if (!fs.existsSync(entryPoint)) {\n      console.error(`Could not find application entry point at ${entryPoint}`);\n      return process.exit(1);\n    }\n\n    const baseServiceTypesPath = path.resolve(\n      process.cwd(),\n      `node_modules/@arkosjs/types/base.service.d.ts`\n    );\n    if (fileExt === \"ts\" && !fs.existsSync(baseServiceTypesPath)) {\n      const answer = await new Promise<boolean>((resolve) => {\n        sheu.warn(\n          'Missing base services types please run \"npx arkos prisma generate\" to generate and sync the types from @prisma/client'\n        );\n        process.stdout.write(\n          `\\n${sheu.green(\"?\", { bold: true })} Would you like to run \"npx arkos prisma generate\"? (Y/n): `\n        );\n        process.stdin.once(\"data\", (data) => {\n          const result = data.toString().trim().toLowerCase();\n          process.stdin.pause();\n          resolve(result === \"y\" || result.length === 0);\n        });\n      });\n\n      if (answer) {\n        console.info(\"\\nSyncing base service with @prisma/client...\");\n        console.log(\"\");\n        execSync(`npx arkos prisma generate`);\n      } else\n        throw Error(\n          'Missing BaseService types please run \"npx arkos prisma generate\" to generate and sync the types from @prisma/client, see more at https://www.arkosjs.com/docs/cli/built-in-cli#typescript-types-generation.'\n        );\n    }\n\n    const getEnv = () =>\n      ({\n        NODE_ENV: \"development\",\n        ...process.env,\n        ...(port && { CLI_PORT: port }),\n        ...(host && { CLI_HOST: host }),\n        CLI: \"false\",\n      }) as { [x: string]: string };\n\n    const env = getEnv();\n    const hostAndPort = await portAndHostAllocator.getHostAndAvailablePort(\n      env,\n      { logWarning: true }\n    );\n\n    watermarkStamper.stamp({\n      ...hostAndPort,\n      envFiles,\n    });\n\n    process.env.__PORT = hostAndPort.port || \"\";\n    process.env.__HOST = hostAndPort.host || \"\";\n\n    const startServer = () => {\n      if (child) {\n        child.kill();\n        child = null;\n      }\n\n      const env = getEnv();\n\n      if (fileExt === \"ts\") {\n        child = spawn(\"npx\", [\"tsx-strict\", \"--watch\", entryPoint], {\n          stdio: \"inherit\",\n          env,\n          shell: true,\n        });\n      } else {\n        child = spawn(\n          \"npx\",\n          [\"tsx-strict\", \"--no-type-check\", \"--watch\", entryPoint],\n          {\n            stdio: \"inherit\",\n            env,\n            shell: true,\n          }\n        );\n      }\n\n      if (child) {\n        child.on(\"error\", (error) => {\n          console.error(\"Failed to start server:\", error);\n        });\n\n        child.on(\"exit\", (code, signal) => {\n          if (!isRestarting && signal !== \"SIGTERM\" && signal !== \"SIGINT\") {\n            console.info(`Server exited with code ${code}, restarting...`);\n            startServer();\n          }\n        });\n      }\n    };\n\n    startServer();\n\n    const cleanup = () => {\n      if (restartTimeout) clearTimeout(restartTimeout);\n\n      if (child) {\n        child.kill(\"SIGTERM\");\n\n        setTimeout(() => {\n          if (child && !child.killed) child.kill(\"SIGKILL\");\n        }, 5000);\n      }\n\n      process.exit(0);\n    };\n\n    process.on(\"SIGINT\", cleanup);\n    process.on(\"SIGTERM\", cleanup);\n\n    process.on(\"uncaughtException\", (error) => {\n      console.error(\"Uncaught Exception:\", error);\n      cleanup();\n    });\n  } catch (error) {\n    sheu.error(\"Development server failed to start:\");\n    console.error(error);\n\n    if (child) {\n      (child as ChildProcess)?.kill?.();\n      child = null;\n    }\n\n    process.exit(1);\n  }\n}\n\n/**\n * Help function to help other processes to terminate the development server child process\n */\nexport function killDevelopmentServerChildProcess() {\n  (child as ChildProcess)?.kill?.();\n  child = null;\n}\n"]}

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

@@ -10,12 +10,11 @@ const fs_1 = __importDefault(require("fs"));
 const child_process_1 = require("child_process");
 const dotenv_helpers_1 = require("../dotenv.helpers");
 const fs_helpers_1 = require("../helpers/fs.helpers");
-const port_and_host_allocator_1 = __importDefault(require("../features/port-and-host-allocator"));
 const watermark_stamper_1 = __importDefault(require("./utils/watermark-stamper"));
 const sheu_1 = __importDefault(require("../sheu"));
 let child = null;
 let envFiles;
-async function startCommand(options = {}) {
+function startCommand(options = {}) {
     if (!process.env.NODE_ENV)
         process.env.NODE_ENV = "production";
     process.env.ARKOS_BUILD = "true";
@@ -35,14 +34,18 @@ async function startCommand(options = {}) {
             ARKOS_BUILD: "true",
             CLI: "false",
         };
-        const hostAndPort = await port_and_host_allocator_1.default.getHostAndAvailablePort(env, {
-            logWarning: true,
-        });
-        env.__PORT = hostAndPort.port || "";
-        env.__HOST = hostAndPort.host || "";
+        env.__HOST =
+            env?.CLI_HOST ||
+                env?.HOST ||
+                (env.ARKOS_BUILD !== "true" ? "0.0.0.0" : "127.0.0.1");
+        env.__PORT =
+            env?.CLI_PORT ||
+                env?.PORT ||
+                "8000";
         watermark_stamper_1.default.stamp({
             envFiles,
-            ...hostAndPort,
+            port: env.__PORT,
+            host: env.__HOST,
         });
         child = (0, child_process_1.spawn)("node", [entryPoint], {
             stdio: "inherit",

package/dist/cjs/utils/cli/start.js.map

@@ -1 +1 @@
-{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../../src/utils/cli/start.ts"],"names":[],"mappings":";;;;;AAoBA,oCA0DC;AAKD,4EAGC;AAtFD,gDAAwB;AACxB,4CAAoB;AACpB,iDAAoD;AACpD,sDAA6D;AAC7D,sDAAqD;AACrD,kGAAuE;AACvE,kFAAyD;AACzD,mDAA2B;AAO3B,IAAI,KAAK,GAAwB,IAAI,CAAC;AACtC,IAAI,QAA8B,CAAC;AAK5B,KAAK,UAAU,YAAY,CAAC,UAAwB,EAAE;IAC3D,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ;QAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,YAAY,CAAC;IAC/D,OAAO,CAAC,GAAG,CAAC,WAAW,GAAG,MAAM,CAAC;IAEjC,QAAQ,GAAG,IAAA,yCAAwB,GAAE,CAAC;IAEtC,IAAI,CAAC;QACH,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;QAE/B,MAAM,UAAU,GAAG,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;QAEvE,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,cAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC;YAC1C,cAAI,CAAC,KAAK,CACR,mDAAmD,IAAA,yBAAY,EAAC,UAAU,CAAC,EAAE,CAC9E,CAAC;YACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QAED,MAAM,GAAG,GAA4B;YACnC,QAAQ,EAAE,YAAY;YACtB,GAAG,OAAO,CAAC,GAAG;YACd,GAAG,CAAC,IAAI,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;YAC/B,GAAG,CAAC,IAAI,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;YAC/B,WAAW,EAAE,MAAM;YACnB,GAAG,EAAE,OAAO;SACb,CAAC;QAEF,MAAM,WAAW,GAAG,MAAM,iCAAoB,CAAC,uBAAuB,CACpE,GAAG,EACH;YACE,UAAU,EAAE,IAAI;SACjB,CACF,CAAC;QAEF,GAAG,CAAC,MAAM,GAAG,WAAW,CAAC,IAAI,IAAI,EAAE,CAAC;QACpC,GAAG,CAAC,MAAM,GAAG,WAAW,CAAC,IAAI,IAAI,EAAE,CAAC;QAEpC,2BAAgB,CAAC,KAAK,CAAC;YACrB,QAAQ;YACR,GAAG,WAAW;SACf,CAAC,CAAC;QAEH,KAAK,GAAG,IAAA,qBAAK,EAAC,MAAM,EAAE,CAAC,UAAU,CAAC,EAAE;YAClC,KAAK,EAAE,SAAS;YAChB,GAAG;YACH,KAAK,EAAE,IAAI;SACZ,CAAC,CAAC;QAEH,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;YACxB,IAAI,KAAK;gBAAE,KAAK,CAAC,IAAI,EAAE,CAAC;YAExB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,cAAI,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAAC;QACjD,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACrB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC;AAKD,SAAgB,gCAAgC;IAC7C,KAAsB,EAAE,IAAI,EAAE,EAAE,CAAC;IAClC,KAAK,GAAG,IAAI,CAAC;AACf,CAAC","sourcesContent":["import path from \"path\";\nimport fs from \"fs\";\nimport { ChildProcess, spawn } from \"child_process\";\nimport { loadEnvironmentVariables } from \"../dotenv.helpers\";\nimport { fullCleanCwd } from \"../helpers/fs.helpers\";\nimport portAndHostAllocator from \"../features/port-and-host-allocator\";\nimport watermarkStamper from \"./utils/watermark-stamper\";\nimport sheu from \"../sheu\";\n\ninterface StartOptions {\n  port?: string;\n  host?: string;\n}\n\nlet child: ChildProcess | null = null;\nlet envFiles: string[] | undefined;\n\n/**\n * Production start command for the arkos CLI\n */\nexport async function startCommand(options: StartOptions = {}) {\n  if (!process.env.NODE_ENV) process.env.NODE_ENV = \"production\";\n  process.env.ARKOS_BUILD = \"true\";\n\n  envFiles = loadEnvironmentVariables();\n\n  try {\n    const { port, host } = options;\n\n    const entryPoint = path.join(process.cwd(), \".build\", \"src\", \"app.js\");\n\n    if (!fs.existsSync(path.join(entryPoint))) {\n      sheu.error(\n        `Could not find built application entry point at ${fullCleanCwd(entryPoint)}`\n      );\n      process.exit(1);\n    }\n\n    const env: { [x: string]: string } = {\n      NODE_ENV: \"production\",\n      ...process.env,\n      ...(port && { CLI_PORT: port }),\n      ...(host && { CLI_HOST: host }),\n      ARKOS_BUILD: \"true\",\n      CLI: \"false\",\n    };\n\n    const hostAndPort = await portAndHostAllocator.getHostAndAvailablePort(\n      env,\n      {\n        logWarning: true,\n      }\n    );\n\n    env.__PORT = hostAndPort.port || \"\";\n    env.__HOST = hostAndPort.host || \"\";\n\n    watermarkStamper.stamp({\n      envFiles,\n      ...hostAndPort,\n    });\n\n    child = spawn(\"node\", [entryPoint], {\n      stdio: \"inherit\",\n      env,\n      shell: true,\n    });\n\n    process.on(\"SIGINT\", () => {\n      if (child) child.kill();\n\n      process.exit(0);\n    });\n  } catch (error) {\n    sheu.error(\"Production server failed to start:\");\n    console.error(error);\n    process.exit(1);\n  }\n}\n\n/**\n * Help function to help other processes to terminate the production server child process\n */\nexport function killProductionServerChildProcess() {\n  (child as ChildProcess)?.kill?.();\n  child = null;\n}\n"]}
+{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../../src/utils/cli/start.ts"],"names":[],"mappings":";;;;;AAmBA,oCA6DC;AAKD,4EAGC;AAxFD,gDAAwB;AACxB,4CAAoB;AACpB,iDAAoD;AACpD,sDAA6D;AAC7D,sDAAqD;AACrD,kFAAyD;AACzD,mDAA2B;AAO3B,IAAI,KAAK,GAAwB,IAAI,CAAC;AACtC,IAAI,QAA8B,CAAC;AAKnC,SAAgB,YAAY,CAAC,UAAwB,EAAE;IACrD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ;QAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,YAAY,CAAC;IAC/D,OAAO,CAAC,GAAG,CAAC,WAAW,GAAG,MAAM,CAAC;IAEjC,QAAQ,GAAG,IAAA,yCAAwB,GAAE,CAAC;IAEtC,IAAI,CAAC;QACH,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;QAE/B,MAAM,UAAU,GAAG,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;QAEvE,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,cAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC;YAC1C,cAAI,CAAC,KAAK,CACR,mDAAmD,IAAA,yBAAY,EAAC,UAAU,CAAC,EAAE,CAC9E,CAAC;YACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QAED,MAAM,GAAG,GAA4B;YACnC,QAAQ,EAAE,YAAY;YACtB,GAAG,OAAO,CAAC,GAAG;YACd,GAAG,CAAC,IAAI,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;YAC/B,GAAG,CAAC,IAAI,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;YAC/B,WAAW,EAAE,MAAM;YACnB,GAAG,EAAE,OAAO;SACb,CAAC;QAEF,GAAG,CAAC,MAAM;YACR,GAAG,EAAE,QAAQ;gBAEb,GAAG,EAAE,IAAI;gBACT,CAAC,GAAG,CAAC,WAAW,KAAK,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;QAEzD,GAAG,CAAC,MAAM;YACR,GAAG,EAAE,QAAQ;gBAEb,GAAG,EAAE,IAAI;gBACT,MAAM,CAAC;QAET,2BAAgB,CAAC,KAAK,CAAC;YACrB,QAAQ;YACR,IAAI,EAAE,GAAG,CAAC,MAAM;YAChB,IAAI,EAAE,GAAG,CAAC,MAAM;SACjB,CAAC,CAAC;QAEH,KAAK,GAAG,IAAA,qBAAK,EAAC,MAAM,EAAE,CAAC,UAAU,CAAC,EAAE;YAClC,KAAK,EAAE,SAAS;YAChB,GAAG;YACH,KAAK,EAAE,IAAI;SACZ,CAAC,CAAC;QAEH,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;YACxB,IAAI,KAAK;gBAAE,KAAK,CAAC,IAAI,EAAE,CAAC;YAExB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,cAAI,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAAC;QACjD,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACrB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC;AAKD,SAAgB,gCAAgC;IAC7C,KAAsB,EAAE,IAAI,EAAE,EAAE,CAAC;IAClC,KAAK,GAAG,IAAI,CAAC;AACf,CAAC","sourcesContent":["import path from \"path\";\nimport fs from \"fs\";\nimport { ChildProcess, spawn } from \"child_process\";\nimport { loadEnvironmentVariables } from \"../dotenv.helpers\";\nimport { fullCleanCwd } from \"../helpers/fs.helpers\";\nimport watermarkStamper from \"./utils/watermark-stamper\";\nimport sheu from \"../sheu\";\n\ninterface StartOptions {\n  port?: string;\n  host?: string;\n}\n\nlet child: ChildProcess | null = null;\nlet envFiles: string[] | undefined;\n\n/**\n * Production start command for the arkos CLI\n */\nexport function startCommand(options: StartOptions = {}) {\n  if (!process.env.NODE_ENV) process.env.NODE_ENV = \"production\";\n  process.env.ARKOS_BUILD = \"true\";\n\n  envFiles = loadEnvironmentVariables();\n\n  try {\n    const { port, host } = options;\n\n    const entryPoint = path.join(process.cwd(), \".build\", \"src\", \"app.js\");\n\n    if (!fs.existsSync(path.join(entryPoint))) {\n      sheu.error(\n        `Could not find built application entry point at ${fullCleanCwd(entryPoint)}`\n      );\n      process.exit(1);\n    }\n\n    const env: { [x: string]: string } = {\n      NODE_ENV: \"production\",\n      ...process.env,\n      ...(port && { CLI_PORT: port }),\n      ...(host && { CLI_HOST: host }),\n      ARKOS_BUILD: \"true\",\n      CLI: \"false\",\n    };\n\n    env.__HOST =\n      env?.CLI_HOST ||\n      // config?.host ||\n      env?.HOST ||\n      (env.ARKOS_BUILD !== \"true\" ? \"0.0.0.0\" : \"127.0.0.1\");\n\n    env.__PORT =\n      env?.CLI_PORT ||\n      // || config?.port\n      env?.PORT ||\n      \"8000\";\n\n    watermarkStamper.stamp({\n      envFiles,\n      port: env.__PORT,\n      host: env.__HOST,\n    });\n\n    child = spawn(\"node\", [entryPoint], {\n      stdio: \"inherit\",\n      env,\n      shell: true,\n    });\n\n    process.on(\"SIGINT\", () => {\n      if (child) child.kill();\n\n      process.exit(0);\n    });\n  } catch (error) {\n    sheu.error(\"Production server failed to start:\");\n    console.error(error);\n    process.exit(1);\n  }\n}\n\n/**\n * Help function to help other processes to terminate the production server child process\n */\nexport function killProductionServerChildProcess() {\n  (child as ChildProcess)?.kill?.();\n  child = null;\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.1-canary.1";
+    return "1.4.1-canary.11";
 }
 //# sourceMappingURL=cli.helpers.js.map

package/dist/cjs/utils/cli/utils/runtime-cli-commander.js

@@ -26,7 +26,8 @@ class RuntimeCliCommander {
     async exportAuthAction() {
         const options = this.getOptions();
         const authActions = services_1.authActionService.getAll();
-        const targetPath = path_1.default.join(process.cwd(), options.path || "", `auth-actions.${(0, fs_helpers_1.getUserFileExtension)()}`);
+        const ext = (0, fs_helpers_1.getUserFileExtension)();
+        const targetPath = path_1.default.join(process.cwd(), options.path || "", `auth-actions.${ext}`);
         let finalAuthActions = authActions;
         let isUpdate = false;
         if (!options.overwrite) {
@@ -67,7 +68,7 @@ npx arkos export auth-action --overwrite
 `);
                     }
                 }
-                finalAuthActions = authActions.map((newAction) => {
+                finalAuthActions = [...authActions, ...existingActions].map((newAction) => {
                     const existingAction = existingActions.find((existing) => existing.action === newAction.action &&
                         existing.resource === newAction.resource);
                     if (existingAction) {
@@ -81,10 +82,9 @@ npx arkos export auth-action --overwrite
                 });
                 isUpdate = true;
             }
-            catch (error) {
-            }
+            catch (error) { }
         }
-        const fileContent = `const authActions = ${JSON.stringify(finalAuthActions, null, 2)}${(0, fs_helpers_1.getUserFileExtension)() === "ts" ? " as const" : ""};
+        const fileContent = `const authActions = ${JSON.stringify(finalAuthActions, null, 2)}${ext === "ts" ? " as const" : ""};
 
 export default authActions;
 `;
@@ -92,7 +92,7 @@ export default authActions;
         await promises_1.default.writeFile(targetPath, fileContent, "utf-8");
         console.info("");
         if (isUpdate)
-            sheu_1.default.done(`Auth actions updated and exported successfully ${(0, fs_helpers_1.fullCleanCwd)(targetPath)}`);
+            sheu_1.default.done(`Auth actions updated and exported successfully at ${(0, fs_helpers_1.fullCleanCwd)(targetPath)}`);
         else
             sheu_1.default.done(`Auth actions exported successfully at ${(0, fs_helpers_1.fullCleanCwd)(targetPath)}`);
         this.end();

package/dist/cjs/utils/cli/utils/runtime-cli-commander.js.map

@@ -1 +1 @@
-{"version":3,"file":"runtime-cli-commander.js","sourceRoot":"","sources":["../../../../../src/utils/cli/utils/runtime-cli-commander.ts"],"names":[],"mappings":"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","sourcesContent":["import { authActionService } from \"../../../exports/services\";\nimport fs from \"fs/promises\";\nimport path from \"path\";\nimport sheu from \"../../sheu\";\nimport { fullCleanCwd, getUserFileExtension } from \"../../helpers/fs.helpers\";\nimport { importModule } from \"../../helpers/global.helpers\";\nimport deepmerge from \"../../helpers/deepmerge.helper\";\nimport { killDevelopmentServerChildProcess } from \"../dev\";\n\n/**\n * Runtime CLI Commander class for handling command-line interface commands\n * during runtime execution. Provides methods for executing various CLI commands\n * and managing their lifecycle.\n *\n * @class RuntimeCliCommander\n */\nclass RuntimeCliCommander {\n  /**\n   * Parses and returns CLI command options from environment variables\n   *\n   * @returns {Object} Parsed CLI command options object\n   *\n   * @example\n   * // Returns { overwrite: true, path: './exports' }\n   * getOptions();\n   */\n  getOptions(): { overwrite?: boolean; path: string } {\n    return JSON.parse(process.env.CLI_COMMAND_OPTIONS || \"{}\");\n  }\n\n  /**\n   * Terminates the development server child process and exits the current process\n   *\n   * @returns {void}\n   */\n  end(): void {\n    killDevelopmentServerChildProcess();\n    process.exit(1);\n  }\n\n  /**\n   * Main command handler that routes to specific command implementations\n   * based on the CLI_COMMAND environment variable\n   *\n   * @returns {Promise<void>}\n   *\n   * @example\n   * // Handles EXPORT_AUTH_ACTION command\n   * await handle();\n   */\n  async handle(): Promise<void> {\n    const command = process.env.CLI_COMMAND;\n    if (command === \"EXPORT_AUTH_ACTION\") await this.exportAuthAction();\n  }\n\n  /**\n   * Exports authentication actions to a file, with options for merging with existing\n   * actions and specifying output path\n   *\n   * @param {Object} [options] - Export configuration options\n   * @param {boolean} [options.overwrite] - Whether to overwrite existing file (default: false)\n   * @param {string} [options.path] - Custom output directory path\n   * @returns {Promise<void>}\n   *\n   * @example\n   * // Export with default options (merge if exists)\n   * await exportAuthAction();\n   *\n   * @example\n   * // Export with overwrite and custom path\n   * await exportAuthAction({ overwrite: true, path: './custom-exports' });\n   */\n  async exportAuthAction(): Promise<void> {\n    const options = this.getOptions() as { overwrite?: boolean; path?: string };\n    const authActions = authActionService.getAll();\n\n    const targetPath = path.join(\n      process.cwd(),\n      options.path || \"\",\n      `auth-actions.${getUserFileExtension()}`\n    );\n\n    let finalAuthActions = authActions;\n    let isUpdate = false;\n\n    if (!options.overwrite) {\n      try {\n        const existingModule = await importModule(targetPath);\n        const existingActions = existingModule.default || existingModule;\n\n        const rolesChanges: string[] = [];\n\n        for (const newAction of authActions) {\n          const existingAction = existingActions.find(\n            (existing: any) =>\n              existing.action === newAction.action &&\n              existing.resource === newAction.resource\n          );\n\n          if (existingAction) {\n            const existingRoles = existingAction.roles\n              ? [...existingAction.roles].sort()\n              : [];\n            const newRoles = newAction.roles ? [...newAction.roles].sort() : [];\n\n            const rolesMatch =\n              existingRoles.length === newRoles.length &&\n              existingRoles.every((role, index) => role === newRoles[index]);\n\n            if (!rolesMatch) {\n              rolesChanges.push(\n                `  - ${newAction.action}:${newAction.resource}: [${existingRoles.join(\", \")}] → [${newRoles.join(\", \")}]`\n              );\n            }\n          }\n        }\n\n        if (rolesChanges.length > 0) {\n          const warningMessage = `Roles for the following permissions will be updated:\\n${rolesChanges.join(\"\\n\")}`;\n\n          sheu.warn(warningMessage);\n\n          const answer = await new Promise<boolean>((resolve) => {\n            process.stdout.write(\n              `\\n${sheu.green(\"?\", { bold: true })} Do you want to proceed with updating these roles? (Y/n): `\n            );\n            process.stdin.once(\"data\", (data) => {\n              const result = data.toString().trim().toLowerCase();\n              process.stdin.pause();\n              resolve(result === \"y\" || result.length === 0);\n            });\n          });\n\n          if (!answer) {\n            throw new Error(\n              `Auth action export cancelled. Roles were not updated to preserve existing permissions., if you would like to overwrite existing auth actions run:\n\nnpx arkos export auth-action --overwrite\n`\n            );\n          }\n        }\n\n        finalAuthActions = authActions.map((newAction) => {\n          const existingAction = existingActions.find(\n            (existing: any) =>\n              existing.action === newAction.action &&\n              existing.resource === newAction.resource\n          );\n\n          if (existingAction) {\n            return {\n              ...newAction,\n              ...existingAction,\n              roles: newAction.roles,\n            };\n          }\n\n          return newAction;\n        });\n        isUpdate = true;\n      } catch (error) {\n        // Handle error appropriately\n      }\n    }\n\n    const fileContent = `const authActions = ${JSON.stringify(finalAuthActions, null, 2)}${getUserFileExtension() === \"ts\" ? \" as const\" : \"\"};\n\nexport default authActions;\n`;\n\n    await fs.mkdir(path.dirname(targetPath), { recursive: true });\n    await fs.writeFile(targetPath, fileContent, \"utf-8\");\n\n    console.info(\"\");\n    if (isUpdate)\n      sheu.done(\n        `Auth actions updated and exported successfully ${fullCleanCwd(targetPath)}`\n      );\n    else\n      sheu.done(\n        `Auth actions exported successfully at ${fullCleanCwd(targetPath)}`\n      );\n\n    this.end();\n  }\n}\n\n/**\n * Singleton instance of RuntimeCliCommander\n *\n * @type {RuntimeCliCommander}\n */\nconst runtimeCliCommander: RuntimeCliCommander = new RuntimeCliCommander();\n\nexport default runtimeCliCommander;\n"]}
+{"version":3,"file":"runtime-cli-commander.js","sourceRoot":"","sources":["../../../../../src/utils/cli/utils/runtime-cli-commander.ts"],"names":[],"mappings":"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","sourcesContent":["import { authActionService } from \"../../../exports/services\";\nimport fs from \"fs/promises\";\nimport path from \"path\";\nimport sheu from \"../../sheu\";\nimport { fullCleanCwd, getUserFileExtension } from \"../../helpers/fs.helpers\";\nimport { importModule } from \"../../helpers/global.helpers\";\nimport { killDevelopmentServerChildProcess } from \"../dev\";\n\n/**\n * Runtime CLI Commander class for handling command-line interface commands\n * during runtime execution. Provides methods for executing various CLI commands\n * and managing their lifecycle.\n *\n * @class RuntimeCliCommander\n */\nclass RuntimeCliCommander {\n  /**\n   * Parses and returns CLI command options from environment variables\n   *\n   * @returns {Object} Parsed CLI command options object\n   *\n   * @example\n   * // Returns { overwrite: true, path: './exports' }\n   * getOptions();\n   */\n  getOptions(): { overwrite?: boolean; path: string } {\n    return JSON.parse(process.env.CLI_COMMAND_OPTIONS || \"{}\");\n  }\n\n  /**\n   * Terminates the development server child process and exits the current process\n   *\n   * @returns {void}\n   */\n  end(): void {\n    killDevelopmentServerChildProcess();\n    process.exit(1);\n  }\n\n  /**\n   * Main command handler that routes to specific command implementations\n   * based on the CLI_COMMAND environment variable\n   *\n   * @returns {Promise<void>}\n   *\n   * @example\n   * // Handles EXPORT_AUTH_ACTION command\n   * await handle();\n   */\n  async handle(): Promise<void> {\n    const command = process.env.CLI_COMMAND;\n    if (command === \"EXPORT_AUTH_ACTION\") await this.exportAuthAction();\n  }\n\n  /**\n   * Exports authentication actions to a file, with options for merging with existing\n   * actions and specifying output path\n   *\n   * @param {Object} [options] - Export configuration options\n   * @param {boolean} [options.overwrite] - Whether to overwrite existing file (default: false)\n   * @param {string} [options.path] - Custom output directory path\n   * @returns {Promise<void>}\n   *\n   * @example\n   * // Export with default options (merge if exists)\n   * await exportAuthAction();\n   *\n   * @example\n   * // Export with overwrite and custom path\n   * await exportAuthAction({ overwrite: true, path: './custom-exports' });\n   */\n  async exportAuthAction(): Promise<void> {\n    const options = this.getOptions() as { overwrite?: boolean; path?: string };\n    const authActions = authActionService.getAll();\n    const ext = getUserFileExtension();\n\n    const targetPath = path.join(\n      process.cwd(),\n      options.path || \"\",\n      `auth-actions.${ext}`\n    );\n\n    let finalAuthActions = authActions;\n    let isUpdate = false;\n\n    if (!options.overwrite) {\n      try {\n        const existingModule = await importModule(targetPath);\n        const existingActions = existingModule.default || existingModule;\n\n        const rolesChanges: string[] = [];\n\n        for (const newAction of authActions) {\n          const existingAction = existingActions.find(\n            (existing: any) =>\n              existing.action === newAction.action &&\n              existing.resource === newAction.resource\n          );\n\n          if (existingAction) {\n            const existingRoles = existingAction.roles\n              ? [...existingAction.roles].sort()\n              : [];\n            const newRoles = newAction.roles ? [...newAction.roles].sort() : [];\n\n            const rolesMatch =\n              existingRoles.length === newRoles.length &&\n              existingRoles.every((role, index) => role === newRoles[index]);\n\n            if (!rolesMatch) {\n              rolesChanges.push(\n                `  - ${newAction.action}:${newAction.resource}: [${existingRoles.join(\", \")}] → [${newRoles.join(\", \")}]`\n              );\n            }\n          }\n        }\n\n        if (rolesChanges.length > 0) {\n          const warningMessage = `Roles for the following permissions will be updated:\\n${rolesChanges.join(\"\\n\")}`;\n\n          sheu.warn(warningMessage);\n\n          const answer = await new Promise<boolean>((resolve) => {\n            process.stdout.write(\n              `\\n${sheu.green(\"?\", { bold: true })} Do you want to proceed with updating these roles? (Y/n): `\n            );\n            process.stdin.once(\"data\", (data) => {\n              const result = data.toString().trim().toLowerCase();\n              process.stdin.pause();\n              resolve(result === \"y\" || result.length === 0);\n            });\n          });\n\n          if (!answer) {\n            throw new Error(\n              `Auth action export cancelled. Roles were not updated to preserve existing permissions., if you would like to overwrite existing auth actions run:\n\nnpx arkos export auth-action --overwrite\n`\n            );\n          }\n        }\n\n        finalAuthActions = [...authActions, ...existingActions].map(\n          (newAction) => {\n            const existingAction = existingActions.find(\n              (existing: any) =>\n                existing.action === newAction.action &&\n                existing.resource === newAction.resource\n            );\n\n            if (existingAction) {\n              return {\n                ...newAction,\n                ...existingAction,\n                roles: newAction.roles,\n              };\n            }\n\n            return newAction;\n          }\n        );\n\n        isUpdate = true;\n      } catch (error) {}\n    }\n\n    const fileContent = `const authActions = ${JSON.stringify(finalAuthActions, null, 2)}${ext === \"ts\" ? \" as const\" : \"\"};\n\nexport default authActions;\n`;\n\n    await fs.mkdir(path.dirname(targetPath), { recursive: true });\n    await fs.writeFile(targetPath, fileContent, \"utf-8\");\n\n    console.info(\"\");\n    if (isUpdate)\n      sheu.done(\n        `Auth actions updated and exported successfully at ${fullCleanCwd(targetPath)}`\n      );\n    else\n      sheu.done(\n        `Auth actions exported successfully at ${fullCleanCwd(targetPath)}`\n      );\n\n    this.end();\n  }\n}\n\n/**\n * Singleton instance of RuntimeCliCommander\n *\n * @type {RuntimeCliCommander}\n */\nconst runtimeCliCommander: RuntimeCliCommander = new RuntimeCliCommander();\n\nexport default runtimeCliCommander;\n"]}

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

@@ -15,8 +15,12 @@ function loadEnvironmentVariables() {
     const envFiles = [
         path_1.default.resolve(cwd, ".env"),
         path_1.default.resolve(cwd, ".env.local"),
-        path_1.default.resolve(cwd, `.env.${ENV}`),
-        path_1.default.resolve(cwd, `.env.${ENV}.local`),
+        ...(ENV
+            ? [
+                path_1.default.resolve(cwd, `.env.${ENV}`),
+                path_1.default.resolve(cwd, `.env.${ENV}.local`),
+            ]
+            : []),
     ];
     envFiles.forEach((filePath) => {
         if (fs_1.default.existsSync(filePath)) {

package/dist/cjs/utils/dotenv.helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"dotenv.helpers.js","sourceRoot":"","sources":["../../../src/utils/dotenv.helpers.ts"],"names":[],"mappings":";;;;;AAcA,4DA8CC;AA5DD,gDAAwB;AACxB,4CAAoB;AACpB,oDAA4B;AAC5B,kDAA0B;AAW1B,SAAgB,wBAAwB;IACtC,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;IACjC,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAC1B,IAAI,UAAU,GAAa,EAAE,CAAC;IAE9B,MAAM,QAAQ,GAAG;QACf,cAAI,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC;QACzB,cAAI,CAAC,OAAO,CAAC,GAAG,EAAE,YAAY,CAAC;QAC/B,cAAI,CAAC,OAAO,CAAC,GAAG,EAAE,QAAQ,GAAG,EAAE,CAAC;QAChC,cAAI,CAAC,OAAO,CAAC,GAAG,EAAE,QAAQ,GAAG,QAAQ,CAAC;KACvC,CAAC;IAEF,QAAQ,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;QAC5B,IAAI,YAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC5B,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,KAAK,MAAM,IAAI,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC;gBACnE,cAAI,CAAC,IAAI,CACP,sBAAsB,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,4BAA4B,CAC7F,CAAC;iBACC,CAAC;gBACJ,MAAM,MAAM,GAAG,gBAAM,CAAC,MAAM,CAAC;oBAC3B,IAAI,EAAE,QAAQ;oBACd,QAAQ,EAAE,IAAI;oBACd,KAAK,EAAE,IAAI;iBACL,CAAC,CAAC;gBAEV,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;oBACjB,OAAO,CAAC,IAAI,CAAC,0BAA0B,QAAQ,EAAE,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;gBACnE,CAAC;;oBAAM,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACnC,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,MAAM,YAAY,GAAG,CAAC,cAAc,CAAC,CAAC;IACtC,MAAM,WAAW,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;IAE5E,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC3B,OAAO,CAAC,KAAK,CACX,yCAAyC,EACzC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CACvB,CAAC;QACF,MAAM,IAAI,KAAK,CACb,2CAA2C,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CACpE,CAAC;IACJ,CAAC;IAED,IAAI,UAAU;QAAE,OAAO,UAAU,CAAC,OAAO,EAAE,CAAC;AAC9C,CAAC","sourcesContent":["import path from \"path\";\nimport fs from \"fs\";\nimport dotenv from \"dotenv\";\nimport sheu from \"./sheu\";\n\n/**\n * Loads environment variables in a prioritized order\n * 1. Base defaults (.env.defaults) - lowest priority\n * 2. Environment-specific (.env.{NODE_ENV})\n * 3. Environment-specific local (.env.{NODE_ENV}.local)\n * 4. Local environment overrides (.env.local)\n * 5. Main .env file (.env)\n * 6. Process environment variables - highest priority (already loaded by Node)\n */\nexport function loadEnvironmentVariables() {\n  const ENV = process.env.NODE_ENV;\n  const cwd = process.cwd();\n  let loadedEnvs: string[] = [];\n\n  const envFiles = [\n    path.resolve(cwd, \".env\"),\n    path.resolve(cwd, \".env.local\"),\n    path.resolve(cwd, `.env.${ENV}`),\n    path.resolve(cwd, `.env.${ENV}.local`),\n  ];\n\n  envFiles.forEach((filePath) => {\n    if (fs.existsSync(filePath)) {\n      if (process.env.ARKOS_BUILD === \"true\" && filePath.endsWith(\".local\"))\n        sheu.warn(\n          `Skipping the local ${filePath.replace(cwd, \"\").replace(\"/\", \"\")} files in production build`\n        );\n      else {\n        const result = dotenv.config({\n          path: filePath,\n          override: true,\n          quiet: true,\n        } as any);\n\n        if (result.error) {\n          console.warn(`Warning: Error loading ${filePath}`, result.error);\n        } else loadedEnvs.push(filePath);\n      }\n    }\n  });\n\n  const requiredVars = [\"DATABASE_URL\"];\n  const missingVars = requiredVars.filter((varName) => !process.env[varName]);\n\n  if (missingVars.length > 0) {\n    console.error(\n      \"Missing required environment variables:\",\n      missingVars.join(\", \")\n    );\n    throw new Error(\n      `Missing required environment variables: ${missingVars.join(\", \")}`\n    );\n  }\n\n  if (loadedEnvs) return loadedEnvs.reverse();\n}\n"]}
+{"version":3,"file":"dotenv.helpers.js","sourceRoot":"","sources":["../../../src/utils/dotenv.helpers.ts"],"names":[],"mappings":";;;;;AAcA,4DAkDC;AAhED,gDAAwB;AACxB,4CAAoB;AACpB,oDAA4B;AAC5B,kDAA0B;AAW1B,SAAgB,wBAAwB;IACtC,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;IACjC,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAC1B,IAAI,UAAU,GAAa,EAAE,CAAC;IAE9B,MAAM,QAAQ,GAAG;QACf,cAAI,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC;QACzB,cAAI,CAAC,OAAO,CAAC,GAAG,EAAE,YAAY,CAAC;QAC/B,GAAG,CAAC,GAAG;YACL,CAAC,CAAC;gBACE,cAAI,CAAC,OAAO,CAAC,GAAG,EAAE,QAAQ,GAAG,EAAE,CAAC;gBAChC,cAAI,CAAC,OAAO,CAAC,GAAG,EAAE,QAAQ,GAAG,QAAQ,CAAC;aACvC;YACH,CAAC,CAAC,EAAE,CAAC;KACR,CAAC;IAEF,QAAQ,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;QAC5B,IAAI,YAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC5B,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,KAAK,MAAM,IAAI,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC;gBACnE,cAAI,CAAC,IAAI,CACP,sBAAsB,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,4BAA4B,CAC7F,CAAC;iBACC,CAAC;gBACJ,MAAM,MAAM,GAAG,gBAAM,CAAC,MAAM,CAAC;oBAC3B,IAAI,EAAE,QAAQ;oBACd,QAAQ,EAAE,IAAI;oBACd,KAAK,EAAE,IAAI;iBACL,CAAC,CAAC;gBAEV,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;oBACjB,OAAO,CAAC,IAAI,CAAC,0BAA0B,QAAQ,EAAE,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;gBACnE,CAAC;;oBAAM,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACnC,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,MAAM,YAAY,GAAG,CAAC,cAAc,CAAC,CAAC;IACtC,MAAM,WAAW,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;IAE5E,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC3B,OAAO,CAAC,KAAK,CACX,yCAAyC,EACzC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CACvB,CAAC;QACF,MAAM,IAAI,KAAK,CACb,2CAA2C,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CACpE,CAAC;IACJ,CAAC;IAED,IAAI,UAAU;QAAE,OAAO,UAAU,CAAC,OAAO,EAAE,CAAC;AAC9C,CAAC","sourcesContent":["import path from \"path\";\nimport fs from \"fs\";\nimport dotenv from \"dotenv\";\nimport sheu from \"./sheu\";\n\n/**\n * Loads environment variables in a prioritized order\n * 1. Base defaults (.env.defaults) - lowest priority\n * 2. Environment-specific (.env.{NODE_ENV})\n * 3. Environment-specific local (.env.{NODE_ENV}.local)\n * 4. Local environment overrides (.env.local)\n * 5. Main .env file (.env)\n * 6. Process environment variables - highest priority (already loaded by Node)\n */\nexport function loadEnvironmentVariables() {\n  const ENV = process.env.NODE_ENV;\n  const cwd = process.cwd();\n  let loadedEnvs: string[] = [];\n\n  const envFiles = [\n    path.resolve(cwd, \".env\"),\n    path.resolve(cwd, \".env.local\"),\n    ...(ENV\n      ? [\n          path.resolve(cwd, `.env.${ENV}`),\n          path.resolve(cwd, `.env.${ENV}.local`),\n        ]\n      : []),\n  ];\n\n  envFiles.forEach((filePath) => {\n    if (fs.existsSync(filePath)) {\n      if (process.env.ARKOS_BUILD === \"true\" && filePath.endsWith(\".local\"))\n        sheu.warn(\n          `Skipping the local ${filePath.replace(cwd, \"\").replace(\"/\", \"\")} files in production build`\n        );\n      else {\n        const result = dotenv.config({\n          path: filePath,\n          override: true,\n          quiet: true,\n        } as any);\n\n        if (result.error) {\n          console.warn(`Warning: Error loading ${filePath}`, result.error);\n        } else loadedEnvs.push(filePath);\n      }\n    }\n  });\n\n  const requiredVars = [\"DATABASE_URL\"];\n  const missingVars = requiredVars.filter((varName) => !process.env[varName]);\n\n  if (missingVars.length > 0) {\n    console.error(\n      \"Missing required environment variables:\",\n      missingVars.join(\", \")\n    );\n    throw new Error(\n      `Missing required environment variables: ${missingVars.join(\", \")}`\n    );\n  }\n\n  if (loadedEnvs) return loadedEnvs.reverse();\n}\n"]}

package/dist/cjs/utils/prisma/prisma-json-schema-generator.js

@@ -217,6 +217,9 @@ class PrismaJsonSchemaGenerator {
         const selectFields = options?.select;
         const omittedFields = options?.omit;
         const includeRelations = options?.include;
+        if (selectFields && includeRelations) {
+            throw new Error(`Found both 'select' and 'include' in ${model.name} query options. Please use one of them.`);
+        }
         for (const field of model.fields) {
             if (field.name === "password")
                 continue;
@@ -225,10 +228,14 @@ class PrismaJsonSchemaGenerator {
             if (selectFields && !selectFields[field.name])
                 continue;
             if (this.isModelRelation(field.type)) {
-                if (includeRelations?.[field.name]) {
+                if (includeRelations?.[field.name] ||
+                    selectFields?.[field.name] ||
+                    omittedFields?.[field.name] === false) {
                     const relationModel = this.schema.models.find((m) => m.name === field.type);
                     if (relationModel) {
-                        const relationSchema = this.generateNestedRelationSchema(relationModel, includeRelations[field.name]);
+                        const relationSchema = this.generateNestedRelationSchema(relationModel, includeRelations?.[field.name] ||
+                            selectFields?.[field.name] ||
+                            omittedFields?.[field.name]);
                         properties[field.name] = field.isArray
                             ? { type: "array", items: relationSchema }
                             : relationSchema;
@@ -252,6 +259,10 @@ class PrismaJsonSchemaGenerator {
         const required = [];
         const selectFields = includeOptions?.select;
         const nestedIncludes = includeOptions?.include;
+        const ommittedFields = includeOptions?.omit;
+        if (selectFields && nestedIncludes) {
+            throw new Error(`Found both 'select' and 'include' in nested ${model.name} query options. Please use one of them.`);
+        }
         for (const field of model.fields) {
             if (field.name.toLowerCase().includes("password")) {
                 continue;
@@ -260,10 +271,14 @@ class PrismaJsonSchemaGenerator {
                 continue;
             }
             if (this.isModelRelation(field.type)) {
-                if (nestedIncludes?.[field.name]) {
+                if (nestedIncludes?.[field.name] ||
+                    selectFields?.[field.name] ||
+                    ommittedFields?.[field.name] === false) {
                     const relationModel = this.schema.models.find((m) => m.name === field.type);
                     if (relationModel) {
-                        const nestedSchema = this.generateNestedRelationSchema(relationModel, nestedIncludes[field.name]);
+                        const nestedSchema = this.generateNestedRelationSchema(relationModel, nestedIncludes?.[field.name] ||
+                            selectFields?.[field.name] ||
+                            ommittedFields?.[field.name]);
                         properties[field.name] = field.isArray
                             ? { type: "array", items: nestedSchema }
                             : nestedSchema;