arkos 1.3.4-canary.7 → 1.3.4-canary.9

package/README.md

@@ -1,6 +1,8 @@
 ![Header Image](https://www.arkosjs.com/img/arkos-readme-header.webp?v=2)
 
-## The Express And Prisma RESTful Framework
+<div align="center">
+<h2>The Express And Prisma RESTful Framework</h2>
+</div>
 
 Arkos.js simplifies the development of secure and scalable RESTful APIs with minimal configuration, allowing developers to focus on what really matters for their business logic.
 

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

@@ -98,6 +98,18 @@ exports.generateCommand = {
             fileSuffix: "hooks",
         });
     },
+    createDto: async (options) => {
+        await generateFile(options, {
+            templateName: "create-dto",
+            fileSuffix: "dto",
+        });
+    },
+    updateDto: async (options) => {
+        await generateFile(options, {
+            templateName: "update-dto",
+            fileSuffix: "dto",
+        });
+    },
     queryOptions: async (options) => {
         await generateFile(options, {
             templateName: "query-options",

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

@@ -1 +1 @@
-{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../../src/utils/cli/generate.ts"],"names":[],"mappings":"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","sourcesContent":["import fs from \"fs\";\nimport path from \"path\";\nimport { generateTemplate } from \"./utils/template-generators\";\nimport { ensureDirectoryExists } from \"./utils/cli.helpers\";\nimport {\n  camelCase,\n  kebabCase,\n  pascalCase,\n} from \"../helpers/change-case.helpers\";\nimport { fullCleanCwd, getUserFileExtension } from \"../helpers/fs.helpers\";\nimport sheu from \"../sheu\";\nimport { capitalize } from \"../helpers/text.helpers\";\n\ninterface GenerateOptions {\n  path?: string;\n  model: string;\n}\n\ninterface GenerateConfig {\n  templateName: string;\n  fileSuffix: string;\n  customValidation?: (modelName: string) => void;\n  customImports?: (names: any) => any;\n}\n\nconst generateFile = async (\n  options: GenerateOptions,\n  config: GenerateConfig\n) => {\n  const modelName = options.model;\n\n  if (!modelName) {\n    sheu.error(\"Module name is required!\");\n    process.exit(1);\n  }\n\n  if (config.customValidation) config.customValidation(modelName);\n\n  const { path: customPath = \"src/modules\" } = options;\n\n  const names = {\n    pascal: pascalCase(modelName),\n    camel: camelCase(modelName),\n    kebab: kebabCase(modelName),\n  };\n\n  const ext = getUserFileExtension();\n  const modulePath = path.join(process.cwd(), customPath, names.kebab);\n  const filePath = path.join(\n    modulePath,\n    `${names.kebab}.${config.fileSuffix}.${ext}`\n  );\n  const humamReadableTemplateName =\n    config.templateName.charAt(0).toUpperCase() +\n    config.templateName.slice(1).replaceAll(\"-\", \" \");\n\n  try {\n    ensureDirectoryExists(modulePath);\n\n    const templateData = {\n      modelName: names,\n      ...(config.customImports && { imports: config.customImports(names) }),\n    };\n\n    const content = generateTemplate(config.templateName, templateData);\n    if (fs.existsSync(filePath))\n      throw new Error(\n        `${capitalize(humamReadableTemplateName.toLowerCase())} for ${options.model} already exists.`\n      );\n    fs.writeFileSync(filePath, content);\n\n    console.info(\"\");\n    sheu.done(\n      `${humamReadableTemplateName} for ${options.model} generated under ${fullCleanCwd(filePath)}`\n    );\n  } catch (err: any) {\n    console.info(\"\");\n    sheu.error(\n      `${`Failed to generate ${humamReadableTemplateName.toLowerCase()}`} for ${options.model} ${filePath ? \"under \" + fullCleanCwd(filePath) + \".\" : \".\"}`\n    );\n    console.info(`${sheu.bold(\"Reason: \")}${err?.message || \"unknown\"}`);\n    process.exit(1);\n  }\n};\n\nexport const generateCommand = {\n  controller: async (options: GenerateOptions) => {\n    await generateFile(options, {\n      templateName: \"controller\",\n      fileSuffix: \"controller\",\n      customImports: () => ({\n        baseController: \"arkos/controllers\",\n      }),\n    });\n  },\n\n  service: async (options: GenerateOptions) => {\n    await generateFile(options, {\n      templateName: \"service\",\n      fileSuffix: \"service\",\n      customImports: () => ({\n        baseService: \"arkos/services\",\n      }),\n    });\n  },\n\n  router: async (options: GenerateOptions) => {\n    await generateFile(options, {\n      templateName: \"router\",\n      fileSuffix: \"router\",\n      customImports: (names) => ({\n        baseRouter: \"arkos\",\n        controller: `./${names.kebab}.controller`,\n      }),\n    });\n  },\n\n  interceptors: async (options: GenerateOptions) => {\n    await generateFile(options, {\n      templateName: \"interceptors\",\n      fileSuffix: \"middlewares\",\n    });\n  },\n\n  authConfigs: async (options: GenerateOptions) => {\n    await generateFile(options, {\n      templateName: \"auth-configs\",\n      fileSuffix: \"auth\",\n    });\n  },\n\n  hooks: async (options: GenerateOptions) => {\n    await generateFile(options, {\n      templateName: \"hooks\",\n      fileSuffix: \"hooks\",\n    });\n  },\n\n  queryOptions: async (options: GenerateOptions) => {\n    await generateFile(options, {\n      templateName: \"query-options\",\n      fileSuffix: \"query\",\n      customValidation: (modelName) => {\n        if (modelName === \"file-upload\") {\n          sheu.error(\n            \"Prisma query options are not available to file-upload resource\"\n          );\n          process.exit(1);\n        }\n      },\n    });\n  },\n};\n"]}
+{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../../src/utils/cli/generate.ts"],"names":[],"mappings":"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","sourcesContent":["import fs from \"fs\";\nimport path from \"path\";\nimport { generateTemplate } from \"./utils/template-generators\";\nimport { ensureDirectoryExists } from \"./utils/cli.helpers\";\nimport {\n  camelCase,\n  kebabCase,\n  pascalCase,\n} from \"../helpers/change-case.helpers\";\nimport { fullCleanCwd, getUserFileExtension } from \"../helpers/fs.helpers\";\nimport sheu from \"../sheu\";\nimport { capitalize } from \"../helpers/text.helpers\";\n\ninterface GenerateOptions {\n  path?: string;\n  model: string;\n}\n\ninterface GenerateConfig {\n  templateName: string;\n  fileSuffix: string;\n  customValidation?: (modelName: string) => void;\n  customImports?: (names: any) => any;\n}\n\nconst generateFile = async (\n  options: GenerateOptions,\n  config: GenerateConfig\n) => {\n  const modelName = options.model;\n\n  if (!modelName) {\n    sheu.error(\"Module name is required!\");\n    process.exit(1);\n  }\n\n  if (config.customValidation) config.customValidation(modelName);\n\n  const { path: customPath = \"src/modules\" } = options;\n\n  const names = {\n    pascal: pascalCase(modelName),\n    camel: camelCase(modelName),\n    kebab: kebabCase(modelName),\n  };\n\n  const ext = getUserFileExtension();\n  const modulePath = path.join(process.cwd(), customPath, names.kebab);\n  const filePath = path.join(\n    modulePath,\n    `${names.kebab}.${config.fileSuffix}.${ext}`\n  );\n  const humamReadableTemplateName =\n    config.templateName.charAt(0).toUpperCase() +\n    config.templateName.slice(1).replaceAll(\"-\", \" \");\n\n  try {\n    ensureDirectoryExists(modulePath);\n\n    const templateData = {\n      modelName: names,\n      ...(config.customImports && { imports: config.customImports(names) }),\n    };\n\n    const content = generateTemplate(config.templateName, templateData);\n    if (fs.existsSync(filePath))\n      throw new Error(\n        `${capitalize(humamReadableTemplateName.toLowerCase())} for ${options.model} already exists.`\n      );\n    fs.writeFileSync(filePath, content);\n\n    console.info(\"\");\n    sheu.done(\n      `${humamReadableTemplateName} for ${options.model} generated under ${fullCleanCwd(filePath)}`\n    );\n  } catch (err: any) {\n    console.info(\"\");\n    sheu.error(\n      `${`Failed to generate ${humamReadableTemplateName.toLowerCase()}`} for ${options.model} ${filePath ? \"under \" + fullCleanCwd(filePath) + \".\" : \".\"}`\n    );\n    console.info(`${sheu.bold(\"Reason: \")}${err?.message || \"unknown\"}`);\n    process.exit(1);\n  }\n};\n\nexport const generateCommand = {\n  controller: async (options: GenerateOptions) => {\n    await generateFile(options, {\n      templateName: \"controller\",\n      fileSuffix: \"controller\",\n      customImports: () => ({\n        baseController: \"arkos/controllers\",\n      }),\n    });\n  },\n\n  service: async (options: GenerateOptions) => {\n    await generateFile(options, {\n      templateName: \"service\",\n      fileSuffix: \"service\",\n      customImports: () => ({\n        baseService: \"arkos/services\",\n      }),\n    });\n  },\n\n  router: async (options: GenerateOptions) => {\n    await generateFile(options, {\n      templateName: \"router\",\n      fileSuffix: \"router\",\n      customImports: (names) => ({\n        baseRouter: \"arkos\",\n        controller: `./${names.kebab}.controller`,\n      }),\n    });\n  },\n\n  interceptors: async (options: GenerateOptions) => {\n    await generateFile(options, {\n      templateName: \"interceptors\",\n      fileSuffix: \"middlewares\",\n    });\n  },\n\n  authConfigs: async (options: GenerateOptions) => {\n    await generateFile(options, {\n      templateName: \"auth-configs\",\n      fileSuffix: \"auth\",\n    });\n  },\n\n  hooks: async (options: GenerateOptions) => {\n    await generateFile(options, {\n      templateName: \"hooks\",\n      fileSuffix: \"hooks\",\n    });\n  },\n\n  createDto: async (options: GenerateOptions) => {\n    await generateFile(options, {\n      templateName: \"create-dto\",\n      fileSuffix: \"dto\",\n    });\n  },\n\n  updateDto: async (options: GenerateOptions) => {\n    await generateFile(options, {\n      templateName: \"update-dto\",\n      fileSuffix: \"dto\",\n    });\n  },\n\n  queryOptions: async (options: GenerateOptions) => {\n    await generateFile(options, {\n      templateName: \"query-options\",\n      fileSuffix: \"query\",\n      customValidation: (modelName) => {\n        if (modelName === \"file-upload\") {\n          sheu.error(\n            \"Prisma query options are not available to file-upload resource\"\n          );\n          process.exit(1);\n        }\n      },\n    });\n  },\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.3.4-canary.7";
+    return "1.3.4-canary.9";
 }
 //# sourceMappingURL=cli.helpers.js.map

package/dist/cjs/utils/features/api.features.js

@@ -184,27 +184,27 @@ class APIFeatures {
         return this;
     }
     _validateNoPasswordExposure(select, include, omit) {
-        const checkForPassword = (obj, path = []) => {
+        const checkForPassword = (obj, prismaKey, path = []) => {
             for (const [key, value] of Object.entries(obj)) {
                 const currentPath = [...path, key];
                 if (key === "password" &&
                     (this.modelName?.toLowerCase() === "user" ||
                         currentPath.at(-3)?.toLowerCase?.() === "user")) {
-                    if (value === false)
+                    if (value === false && prismaKey === "omit")
                         throw new app_error_1.default("Cannot disable password omission protection", 400, { ...obj }, "CannotExposeUserPassword");
-                    if (value === true && !omit?.["password"])
+                    if (value === true && ["include", "select"].includes(prismaKey))
                         throw new app_error_1.default("User password exposure detected", 403, {}, "UserPasswordExposureDetected");
                 }
                 if (typeof value === "object" &&
                     value !== null &&
                     !Array.isArray(value)) {
-                    checkForPassword(value, currentPath);
+                    checkForPassword(value, prismaKey, currentPath);
                 }
             }
         };
-        checkForPassword(select);
-        checkForPassword(include);
-        checkForPassword(omit);
+        checkForPassword(select, "select");
+        checkForPassword(include, "include");
+        checkForPassword(omit, "omit");
     }
     paginate() {
         const paginationOptions = (() => {

package/dist/cjs/utils/features/api.features.js.map

@@ -1 +1 @@
-{"version":3,"file":"api.features.js","sourceRoot":"","sources":["../../../../src/utils/features/api.features.ts"],"names":[],"mappings":"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","sourcesContent":["import { Request } from \"express\";\nimport deepmerge from \"../helpers/deepmerge.helper\";\nimport { parseQueryParamsWithModifiers } from \"../helpers/api.features.helpers\";\nimport AppError from \"../../modules/error-handler/utils/app-error\";\nimport { getPrismaInstance } from \"../helpers/prisma.helpers\";\nimport { ArkosRequest } from \"../../types\";\nimport debuggerService from \"../../modules/debugger/debugger.service\";\n\ntype ModelName = string;\n\nexport default class APIFeatures {\n  req?: ArkosRequest;\n  searchParams: any;\n  searchParamsWithModifiers: any;\n  filters: Record<string, any> = {};\n  reqFiltersSearchParam: any = {};\n  modelName?: ModelName;\n  excludedFields = [\n    \"page\",\n    \"filters\",\n    \"sort\",\n    \"limit\",\n    \"fields\",\n    \"addFields\",\n    \"removeFields\",\n    \"search\",\n    \"include\",\n    \"filterMode\",\n    \"where\",\n    \"prismaQueryOptions\",\n    \"ignoredFields\",\n    \"select\",\n    \"omit\",\n  ];\n\n  constructor(req?: Request, modelName?: ModelName) {\n    if (req) {\n      const { filters = \"{}\", ...restOfQuery } = req.query;\n      this.req = req;\n\n      let parsedFilters = {};\n      try {\n        parsedFilters = JSON.parse(filters as string);\n      } catch (error) {\n        throw new AppError(\"Invalid req.query.filters JSON format\", 400);\n      }\n\n      this.searchParams = deepmerge(\n        parseQueryParamsWithModifiers(restOfQuery),\n        parseQueryParamsWithModifiers(parsedFilters)\n      );\n\n      debuggerService.handleTransformedQueryLog(this.searchParams);\n    }\n\n    if (modelName) this.modelName = modelName;\n    this.filters = { ...this.filters };\n  }\n\n  filter() {\n    if (!this.req)\n      throw new Error(\n        \"Trying to use APIFeatures.filter() without passing request on class constructor or APIFeatures.setup() method.\"\n      );\n\n    const searchableFields: Record<string, any>[] = [];\n    const queryObj = { ...this.searchParams };\n\n    this.excludedFields.forEach((el) => delete queryObj[el]);\n\n    const topLevelOR = queryObj.OR;\n    const topLevelAND = queryObj.AND;\n    delete queryObj.OR;\n    delete queryObj.AND;\n\n    const whereObj = { ...this.req.params, ...queryObj };\n    const whereLogicalOperatorFilters = Object.keys(whereObj).map((key) => ({\n      [key]: whereObj[key],\n    }));\n\n    let whereOptions: any = {};\n\n    if (whereLogicalOperatorFilters.length > 0) {\n      whereOptions = {\n        [(this.req.query?.filterMode as string) ?? \"OR\"]:\n          whereLogicalOperatorFilters,\n      };\n    }\n\n    if (topLevelOR) {\n      if (whereOptions.OR) {\n        whereOptions.OR = [...whereOptions.OR, ...topLevelOR];\n      } else {\n        whereOptions.OR = topLevelOR;\n      }\n    }\n\n    if (topLevelAND) {\n      if (whereOptions.AND) {\n        whereOptions.AND = [...whereOptions.AND, ...topLevelAND];\n      } else {\n        whereOptions.AND = topLevelAND;\n      }\n    }\n\n    if (!!this.searchParams.search) {\n      const prisma = getPrismaInstance();\n\n      if (!this.modelName)\n        throw new Error(\"Model name is required for search functionality\");\n\n      if (!prisma[this.modelName] || !prisma[this.modelName].fields)\n        throw new Error(`Model '${this.modelName}' not found or has no fields`);\n\n      Object.keys((prisma as any)[this.modelName].fields).forEach((key) => {\n        const field = ((prisma as any)[this.modelName!].fields as any)[key];\n        if (\n          field?.typeName === \"String\" &&\n          key !== \"id\" &&\n          key !== \"password\" &&\n          !field.isList &&\n          !key?.includes?.(\"Id\") &&\n          !key?.includes?.(\"ID\")\n        ) {\n          searchableFields.push({\n            [`${key}`]: {\n              contains: this.searchParams.search,\n              mode: \"insensitive\",\n            },\n          });\n        }\n      });\n\n      if (searchableFields.length > 0) {\n        whereOptions = deepmerge(\n          {\n            OR: searchableFields,\n          },\n          whereOptions\n        );\n      }\n    }\n\n    const firstMerge = deepmerge(\n      {\n        where: whereOptions,\n      },\n      this.req.prismaQueryOptions || {}\n    );\n\n    this.filters = deepmerge(firstMerge, this.filters);\n    this.searchParams = deepmerge(\n      this.searchParams || {},\n      this.req.prismaQueryOptions || {}\n    );\n\n    return this;\n  }\n\n  sort() {\n    if (this.searchParams.sort) {\n      const sortBy = this.searchParams?.sort\n        ?.split(\",\")\n        ?.map((field: string) => ({\n          [field.startsWith(\"-\") ? field.substring(1) : field]:\n            field.startsWith(\"-\") ? \"desc\" : \"asc\",\n        }));\n      this.filters = deepmerge(this.filters, { orderBy: sortBy });\n    }\n\n    return this;\n  }\n\n  limitFields() {\n    let finalSelect: Record<string, any> = {};\n    let finalInclude: Record<string, any> = {};\n    let finalOmit: Record<string, any> = {};\n\n    if (this.searchParams?.fields) {\n      const fields = this.searchParams.fields.split(\",\");\n\n      const regularFields = fields.filter(\n        (field: string) => !field.startsWith(\"+\") && !field.startsWith(\"-\")\n      );\n      const includeFields = fields\n        .filter((field: string) => field.startsWith(\"+\"))\n        .map((field: string) => field.substring(1));\n      const excludeFields = fields\n        .filter((field: string) => field.startsWith(\"-\"))\n        .map((field: string) => field.substring(1));\n\n      if (regularFields.length > 0) {\n        finalSelect = regularFields.reduce(\n          (acc: Record<string, any>, field: string) => {\n            acc[field] = true;\n            return acc;\n          },\n          {} as Record<string, any>\n        );\n      }\n\n      includeFields.forEach((field: string) => {\n        finalInclude[field] = true;\n      });\n\n      excludeFields.forEach((field: string) => {\n        finalOmit[field] = true;\n      });\n    }\n\n    if (this.searchParams.include || this.filters.include)\n      finalInclude = deepmerge(\n        finalInclude,\n        deepmerge(this.filters?.include || {}, this.searchParams?.include || {})\n      );\n\n    if (this.searchParams.select || this.filters.include)\n      finalSelect = deepmerge(\n        finalSelect,\n        deepmerge(this.filters?.select || {}, this.searchParams?.select || {})\n      );\n\n    if (this.searchParams.omit || this.filters.omit)\n      finalOmit = deepmerge(\n        finalOmit,\n        deepmerge(this.filters?.omit || {}, this.searchParams?.omit || {})\n      );\n\n    if (\n      Object.keys(finalSelect).length > 0 &&\n      Object.keys(finalInclude).length > 0\n    ) {\n      finalSelect = deepmerge(finalSelect, finalInclude);\n      finalInclude = {};\n      delete this.filters.include;\n      delete this.searchParams.include;\n    }\n\n    this._validateNoPasswordExposure(finalSelect, finalInclude, finalOmit);\n\n    // ALWAYS protect password field in finalOmit\n    if (finalOmit.password === false)\n      throw new AppError(\"Cannot disable password omission protection\", 400);\n\n    if (this.modelName?.toLowerCase?.() === \"user\") finalOmit.password = true;\n\n    if (Object.keys(finalSelect).length > 0) this.filters.select = finalSelect;\n\n    if (Object.keys(finalInclude).length > 0)\n      this.filters.include = finalInclude;\n\n    if (Object.keys(finalOmit).length > 0) this.filters.omit = finalOmit;\n\n    if (this.searchParams?.addFields || this.searchParams?.removeFields) {\n      throw new AppError(\n        \"The addFields and removeFields parameters are deprecated.\",\n        400\n      );\n    }\n\n    return this;\n  }\n\n  private _validateNoPasswordExposure(\n    select: Record<string, any>,\n    include: Record<string, any>,\n    omit: Record<string, any>\n  ) {\n    const checkForPassword = (\n      obj: Record<string, any>,\n      path: string[] = []\n    ) => {\n      for (const [key, value] of Object.entries(obj)) {\n        const currentPath = [...path, key];\n\n        if (\n          key === \"password\" &&\n          (this.modelName?.toLowerCase() === \"user\" ||\n            currentPath.at(-3)?.toLowerCase?.() === \"user\")\n        ) {\n          if (value === false)\n            throw new AppError(\n              \"Cannot disable password omission protection\",\n              400,\n              { ...obj },\n              \"CannotExposeUserPassword\"\n            );\n\n          if (value === true && !omit?.[\"password\"])\n            throw new AppError(\n              \"User password exposure detected\",\n              403,\n              {},\n              \"UserPasswordExposureDetected\"\n            );\n        }\n\n        if (\n          typeof value === \"object\" &&\n          value !== null &&\n          !Array.isArray(value)\n        ) {\n          checkForPassword(value, currentPath);\n        }\n      }\n    };\n\n    checkForPassword(select);\n    checkForPassword(include);\n    checkForPassword(omit);\n  }\n\n  paginate(): APIFeatures {\n    const paginationOptions = (() => {\n      if (this.searchParams.limit === \"all\") return {};\n\n      const page = parseInt(this.searchParams.page, 10) || 1;\n      const limit = parseInt(this.searchParams.limit, 10) || 30;\n      const skip = (page - 1) * limit;\n\n      return { skip, take: limit };\n    })();\n\n    this.filters = {\n      ...this.filters,\n      ...paginationOptions,\n    };\n    return this;\n  }\n}\n"]}
+{"version":3,"file":"api.features.js","sourceRoot":"","sources":["../../../../src/utils/features/api.features.ts"],"names":[],"mappings":"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","sourcesContent":["import { Request } from \"express\";\nimport deepmerge from \"../helpers/deepmerge.helper\";\nimport { parseQueryParamsWithModifiers } from \"../helpers/api.features.helpers\";\nimport AppError from \"../../modules/error-handler/utils/app-error\";\nimport { getPrismaInstance } from \"../helpers/prisma.helpers\";\nimport { ArkosRequest } from \"../../types\";\nimport debuggerService from \"../../modules/debugger/debugger.service\";\n\ntype ModelName = string;\n\nexport default class APIFeatures {\n  req?: ArkosRequest;\n  searchParams: any;\n  searchParamsWithModifiers: any;\n  filters: Record<string, any> = {};\n  reqFiltersSearchParam: any = {};\n  modelName?: ModelName;\n  excludedFields = [\n    \"page\",\n    \"filters\",\n    \"sort\",\n    \"limit\",\n    \"fields\",\n    \"addFields\",\n    \"removeFields\",\n    \"search\",\n    \"include\",\n    \"filterMode\",\n    \"where\",\n    \"prismaQueryOptions\",\n    \"ignoredFields\",\n    \"select\",\n    \"omit\",\n  ];\n\n  constructor(req?: Request, modelName?: ModelName) {\n    if (req) {\n      const { filters = \"{}\", ...restOfQuery } = req.query;\n      this.req = req;\n\n      let parsedFilters = {};\n      try {\n        parsedFilters = JSON.parse(filters as string);\n      } catch (error) {\n        throw new AppError(\"Invalid req.query.filters JSON format\", 400);\n      }\n\n      this.searchParams = deepmerge(\n        parseQueryParamsWithModifiers(restOfQuery),\n        parseQueryParamsWithModifiers(parsedFilters)\n      );\n\n      debuggerService.handleTransformedQueryLog(this.searchParams);\n    }\n\n    if (modelName) this.modelName = modelName;\n    this.filters = { ...this.filters };\n  }\n\n  filter() {\n    if (!this.req)\n      throw new Error(\n        \"Trying to use APIFeatures.filter() without passing request on class constructor or APIFeatures.setup() method.\"\n      );\n\n    const searchableFields: Record<string, any>[] = [];\n    const queryObj = { ...this.searchParams };\n\n    this.excludedFields.forEach((el) => delete queryObj[el]);\n\n    const topLevelOR = queryObj.OR;\n    const topLevelAND = queryObj.AND;\n    delete queryObj.OR;\n    delete queryObj.AND;\n\n    const whereObj = { ...this.req.params, ...queryObj };\n    const whereLogicalOperatorFilters = Object.keys(whereObj).map((key) => ({\n      [key]: whereObj[key],\n    }));\n\n    let whereOptions: any = {};\n\n    if (whereLogicalOperatorFilters.length > 0) {\n      whereOptions = {\n        [(this.req.query?.filterMode as string) ?? \"OR\"]:\n          whereLogicalOperatorFilters,\n      };\n    }\n\n    if (topLevelOR) {\n      if (whereOptions.OR) {\n        whereOptions.OR = [...whereOptions.OR, ...topLevelOR];\n      } else {\n        whereOptions.OR = topLevelOR;\n      }\n    }\n\n    if (topLevelAND) {\n      if (whereOptions.AND) {\n        whereOptions.AND = [...whereOptions.AND, ...topLevelAND];\n      } else {\n        whereOptions.AND = topLevelAND;\n      }\n    }\n\n    if (!!this.searchParams.search) {\n      const prisma = getPrismaInstance();\n\n      if (!this.modelName)\n        throw new Error(\"Model name is required for search functionality\");\n\n      if (!prisma[this.modelName] || !prisma[this.modelName].fields)\n        throw new Error(`Model '${this.modelName}' not found or has no fields`);\n\n      Object.keys((prisma as any)[this.modelName].fields).forEach((key) => {\n        const field = ((prisma as any)[this.modelName!].fields as any)[key];\n        if (\n          field?.typeName === \"String\" &&\n          key !== \"id\" &&\n          key !== \"password\" &&\n          !field.isList &&\n          !key?.includes?.(\"Id\") &&\n          !key?.includes?.(\"ID\")\n        ) {\n          searchableFields.push({\n            [`${key}`]: {\n              contains: this.searchParams.search,\n              mode: \"insensitive\",\n            },\n          });\n        }\n      });\n\n      if (searchableFields.length > 0) {\n        whereOptions = deepmerge(\n          {\n            OR: searchableFields,\n          },\n          whereOptions\n        );\n      }\n    }\n\n    const firstMerge = deepmerge(\n      {\n        where: whereOptions,\n      },\n      this.req.prismaQueryOptions || {}\n    );\n\n    this.filters = deepmerge(firstMerge, this.filters);\n    this.searchParams = deepmerge(\n      this.searchParams || {},\n      this.req.prismaQueryOptions || {}\n    );\n\n    return this;\n  }\n\n  sort() {\n    if (this.searchParams.sort) {\n      const sortBy = this.searchParams?.sort\n        ?.split(\",\")\n        ?.map((field: string) => ({\n          [field.startsWith(\"-\") ? field.substring(1) : field]:\n            field.startsWith(\"-\") ? \"desc\" : \"asc\",\n        }));\n      this.filters = deepmerge(this.filters, { orderBy: sortBy });\n    }\n\n    return this;\n  }\n\n  limitFields() {\n    let finalSelect: Record<string, any> = {};\n    let finalInclude: Record<string, any> = {};\n    let finalOmit: Record<string, any> = {};\n\n    if (this.searchParams?.fields) {\n      const fields = this.searchParams.fields.split(\",\");\n\n      const regularFields = fields.filter(\n        (field: string) => !field.startsWith(\"+\") && !field.startsWith(\"-\")\n      );\n      const includeFields = fields\n        .filter((field: string) => field.startsWith(\"+\"))\n        .map((field: string) => field.substring(1));\n      const excludeFields = fields\n        .filter((field: string) => field.startsWith(\"-\"))\n        .map((field: string) => field.substring(1));\n\n      if (regularFields.length > 0) {\n        finalSelect = regularFields.reduce(\n          (acc: Record<string, any>, field: string) => {\n            acc[field] = true;\n            return acc;\n          },\n          {} as Record<string, any>\n        );\n      }\n\n      includeFields.forEach((field: string) => {\n        finalInclude[field] = true;\n      });\n\n      excludeFields.forEach((field: string) => {\n        finalOmit[field] = true;\n      });\n    }\n\n    if (this.searchParams.include || this.filters.include)\n      finalInclude = deepmerge(\n        finalInclude,\n        deepmerge(this.filters?.include || {}, this.searchParams?.include || {})\n      );\n\n    if (this.searchParams.select || this.filters.include)\n      finalSelect = deepmerge(\n        finalSelect,\n        deepmerge(this.filters?.select || {}, this.searchParams?.select || {})\n      );\n\n    if (this.searchParams.omit || this.filters.omit)\n      finalOmit = deepmerge(\n        finalOmit,\n        deepmerge(this.filters?.omit || {}, this.searchParams?.omit || {})\n      );\n\n    if (\n      Object.keys(finalSelect).length > 0 &&\n      Object.keys(finalInclude).length > 0\n    ) {\n      finalSelect = deepmerge(finalSelect, finalInclude);\n      finalInclude = {};\n      delete this.filters.include;\n      delete this.searchParams.include;\n    }\n\n    this._validateNoPasswordExposure(finalSelect, finalInclude, finalOmit);\n\n    // ALWAYS protect password field in finalOmit\n    if (finalOmit.password === false)\n      throw new AppError(\"Cannot disable password omission protection\", 400);\n\n    if (this.modelName?.toLowerCase?.() === \"user\") finalOmit.password = true;\n\n    if (Object.keys(finalSelect).length > 0) this.filters.select = finalSelect;\n\n    if (Object.keys(finalInclude).length > 0)\n      this.filters.include = finalInclude;\n\n    if (Object.keys(finalOmit).length > 0) this.filters.omit = finalOmit;\n\n    if (this.searchParams?.addFields || this.searchParams?.removeFields) {\n      throw new AppError(\n        \"The addFields and removeFields parameters are deprecated.\",\n        400\n      );\n    }\n\n    return this;\n  }\n\n  private _validateNoPasswordExposure(\n    select: Record<string, any>,\n    include: Record<string, any>,\n    omit: Record<string, any>\n  ) {\n    const checkForPassword = (\n      obj: Record<string, any>,\n      prismaKey: string,\n      path: string[] = []\n    ) => {\n      for (const [key, value] of Object.entries(obj)) {\n        const currentPath = [...path, key];\n\n        if (\n          key === \"password\" &&\n          (this.modelName?.toLowerCase() === \"user\" ||\n            currentPath.at(-3)?.toLowerCase?.() === \"user\")\n        ) {\n          if (value === false && prismaKey === \"omit\")\n            throw new AppError(\n              \"Cannot disable password omission protection\",\n              400,\n              { ...obj },\n              \"CannotExposeUserPassword\"\n            );\n\n          if (value === true && [\"include\", \"select\"].includes(prismaKey))\n            throw new AppError(\n              \"User password exposure detected\",\n              403,\n              {},\n              \"UserPasswordExposureDetected\"\n            );\n        }\n\n        if (\n          typeof value === \"object\" &&\n          value !== null &&\n          !Array.isArray(value)\n        ) {\n          checkForPassword(value, prismaKey, currentPath);\n        }\n      }\n    };\n\n    checkForPassword(select, \"select\");\n    checkForPassword(include, \"include\");\n    checkForPassword(omit, \"omit\");\n  }\n\n  paginate(): APIFeatures {\n    const paginationOptions = (() => {\n      if (this.searchParams.limit === \"all\") return {};\n\n      const page = parseInt(this.searchParams.page, 10) || 1;\n      const limit = parseInt(this.searchParams.limit, 10) || 30;\n      const skip = (page - 1) * limit;\n\n      return { skip, take: limit };\n    })();\n\n    this.filters = {\n      ...this.filters,\n      ...paginationOptions,\n    };\n    return this;\n  }\n}\n"]}

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

@@ -15,7 +15,15 @@ exports.crd = crd;
 function fullCleanCwd(path) {
     if (typeof path !== "string")
         throw new Error("Path must be a string");
-    return path.replace(process.cwd(), "").replace("/", "").replace("\\", "");
+    if (path.startsWith(`/${process.cwd()}`) ||
+        path.startsWith(`${process.cwd()}`) ||
+        path.startsWith(`${process.cwd()}/`))
+        return path
+            .replace(process.cwd(), "")
+            .replace(/^\/+/g, "")
+            .replace("\\", "");
+    else
+        return path;
 }
 const getUserFileExtension = () => {
     if (exports.userFileExtension)

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

@@ -1 +1 @@
-{"version":3,"file":"fs.helpers.js","sourceRoot":"","sources":["../../../../src/utils/helpers/fs.helpers.ts"],"names":[],"mappings":";;;;;;AAcA,oCAIC;AAiDD,0CAMC;AAzED,4CAAoB;AACpB,gDAAwB;AAEjB,MAAM,GAAG,GAAG,GAAG,EAAE,CACtB,OAAO,CAAC,GAAG,CAAC,WAAW,KAAK,MAAM;IAChC,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,UAAU;IAC5B,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;AAHP,QAAA,GAAG,OAGI;AAQpB,SAAgB,YAAY,CAAC,IAAY;IACvC,IAAI,OAAO,IAAI,KAAK,QAAQ;QAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;IAEvE,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;AAC5E,CAAC;AASM,MAAM,oBAAoB,GAAG,GAAgB,EAAE;IACpD,IAAI,yBAAiB;QAAE,OAAO,yBAAiB,CAAC;IAEhD,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;QAEjC,MAAM,WAAW,GAAG,YAAE,CAAC,UAAU,CAAC,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC,CAAC;QAE1E,MAAM,QAAQ,GAAG,YAAE,CAAC,UAAU,CAAC,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;QACvE,MAAM,QAAQ,GAAG,YAAE,CAAC,UAAU,CAAC,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;QAEvE,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,KAAK,MAAM,CAAC;QAEvD,IAAI,WAAW;YAAE,yBAAiB,GAAG,IAAI,CAAC;aACrC,IAAI,WAAW,IAAI,QAAQ;YAAE,yBAAiB,GAAG,IAAI,CAAC;aACtD,IAAI,QAAQ,IAAI,CAAC,QAAQ;YAAE,yBAAiB,GAAG,IAAI,CAAC;aACpD,IAAI,QAAQ;YAAE,yBAAiB,GAAG,IAAI,CAAC;;YACvC,yBAAiB,GAAG,IAAI,CAAC;QAE9B,OAAO,yBAAiB,CAAC;IAC3B,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,yBAAiB,GAAG,IAAI,CAAC;QACzB,OAAO,yBAAiB,CAAC;IAC3B,CAAC;AACH,CAAC,CAAC;AAxBW,QAAA,oBAAoB,wBAwB/B;AAgBF,SAAgB,eAAe,CAAC,QAAgB;IAC9C,IAAI,CAAC;QACH,OAAO,YAAE,CAAC,UAAU,CAAC,cAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC/C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC","sourcesContent":["import fs from \"fs\";\nimport path from \"path\";\n\nexport const crd = () =>\n  process.env.ARKOS_BUILD === \"true\"\n    ? process.cwd() + \"/.build/\"\n    : process.cwd();\n\n/**\n * Removes the current working directory prefix from the given path.\n * Handles cases with or without a trailing slash in cwd.\n * @param path - The path to clean\n * @returns The path without the cwd prefix\n */\nexport function fullCleanCwd(path: string): string {\n  if (typeof path !== \"string\") throw new Error(\"Path must be a string\");\n\n  return path.replace(process.cwd(), \"\").replace(\"/\", \"\").replace(\"\\\\\", \"\");\n}\n\nexport let userFileExtension: \"ts\" | \"js\" | undefined;\n\n/**\n * Detects the file extension that should be used in the current execution context\n * Returns 'ts' when TypeScript config exists and not in build mode, otherwise 'js'\n * @returns 'ts' | 'js'\n */\nexport const getUserFileExtension = (): \"ts\" | \"js\" => {\n  if (userFileExtension) return userFileExtension;\n\n  try {\n    const currentDir = process.cwd();\n\n    const hasTsConfig = fs.existsSync(path.join(currentDir, \"tsconfig.json\"));\n\n    const hasAppTs = fs.existsSync(path.join(currentDir, \"src\", \"app.ts\"));\n    const hasAppJs = fs.existsSync(path.join(currentDir, \"src\", \"app.js\"));\n\n    const isBuildMode = process.env.ARKOS_BUILD === \"true\";\n\n    if (isBuildMode) userFileExtension = \"js\";\n    else if (hasTsConfig && hasAppTs) userFileExtension = \"ts\";\n    else if (hasAppTs && !hasAppJs) userFileExtension = \"ts\";\n    else if (hasAppJs) userFileExtension = \"js\";\n    else userFileExtension = \"js\";\n\n    return userFileExtension;\n  } catch (e) {\n    userFileExtension = \"js\";\n    return userFileExtension;\n  }\n};\n\n/**\n * Checks if a file exists at the specified file path.\n *\n * @param filePath - The path to the file to check\n * @returns {boolean} True if the file exists, false otherwise or if there's an error\n *\n * @example\n * ```ts\n * const exists = checkFileExists('./path/to/file.txt');\n * if (exists) {\n *   console.info('File exists!');\n * }\n * ```\n */\nexport function checkFileExists(filePath: string): boolean {\n  try {\n    return fs.existsSync(path.resolve(filePath));\n  } catch (error) {\n    return false;\n  }\n}\n"]}
+{"version":3,"file":"fs.helpers.js","sourceRoot":"","sources":["../../../../src/utils/helpers/fs.helpers.ts"],"names":[],"mappings":";;;;;;AAcA,oCAaC;AAiDD,0CAMC;AAlFD,4CAAoB;AACpB,gDAAwB;AAEjB,MAAM,GAAG,GAAG,GAAG,EAAE,CACtB,OAAO,CAAC,GAAG,CAAC,WAAW,KAAK,MAAM;IAChC,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,UAAU;IAC5B,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;AAHP,QAAA,GAAG,OAGI;AAQpB,SAAgB,YAAY,CAAC,IAAY;IACvC,IAAI,OAAO,IAAI,KAAK,QAAQ;QAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;IAEvE,IACE,IAAI,CAAC,UAAU,CAAC,IAAI,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC;QACpC,IAAI,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC;QACnC,IAAI,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC;QAEpC,OAAO,IAAI;aACR,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE,CAAC;aAC1B,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;aACpB,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;;QAClB,OAAO,IAAI,CAAC;AACnB,CAAC;AASM,MAAM,oBAAoB,GAAG,GAAgB,EAAE;IACpD,IAAI,yBAAiB;QAAE,OAAO,yBAAiB,CAAC;IAEhD,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;QAEjC,MAAM,WAAW,GAAG,YAAE,CAAC,UAAU,CAAC,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC,CAAC;QAE1E,MAAM,QAAQ,GAAG,YAAE,CAAC,UAAU,CAAC,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;QACvE,MAAM,QAAQ,GAAG,YAAE,CAAC,UAAU,CAAC,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;QAEvE,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,KAAK,MAAM,CAAC;QAEvD,IAAI,WAAW;YAAE,yBAAiB,GAAG,IAAI,CAAC;aACrC,IAAI,WAAW,IAAI,QAAQ;YAAE,yBAAiB,GAAG,IAAI,CAAC;aACtD,IAAI,QAAQ,IAAI,CAAC,QAAQ;YAAE,yBAAiB,GAAG,IAAI,CAAC;aACpD,IAAI,QAAQ;YAAE,yBAAiB,GAAG,IAAI,CAAC;;YACvC,yBAAiB,GAAG,IAAI,CAAC;QAE9B,OAAO,yBAAiB,CAAC;IAC3B,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,yBAAiB,GAAG,IAAI,CAAC;QACzB,OAAO,yBAAiB,CAAC;IAC3B,CAAC;AACH,CAAC,CAAC;AAxBW,QAAA,oBAAoB,wBAwB/B;AAgBF,SAAgB,eAAe,CAAC,QAAgB;IAC9C,IAAI,CAAC;QACH,OAAO,YAAE,CAAC,UAAU,CAAC,cAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC/C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC","sourcesContent":["import fs from \"fs\";\nimport path from \"path\";\n\nexport const crd = () =>\n  process.env.ARKOS_BUILD === \"true\"\n    ? process.cwd() + \"/.build/\"\n    : process.cwd();\n\n/**\n * Removes the current working directory prefix from the given path.\n * Handles cases with or without a trailing slash in cwd.\n * @param path - The path to clean\n * @returns The path without the cwd prefix\n */\nexport function fullCleanCwd(path: string): string {\n  if (typeof path !== \"string\") throw new Error(\"Path must be a string\");\n\n  if (\n    path.startsWith(`/${process.cwd()}`) ||\n    path.startsWith(`${process.cwd()}`) ||\n    path.startsWith(`${process.cwd()}/`)\n  )\n    return path\n      .replace(process.cwd(), \"\")\n      .replace(/^\\/+/g, \"\")\n      .replace(\"\\\\\", \"\");\n  else return path;\n}\n\nexport let userFileExtension: \"ts\" | \"js\" | undefined;\n\n/**\n * Detects the file extension that should be used in the current execution context\n * Returns 'ts' when TypeScript config exists and not in build mode, otherwise 'js'\n * @returns 'ts' | 'js'\n */\nexport const getUserFileExtension = (): \"ts\" | \"js\" => {\n  if (userFileExtension) return userFileExtension;\n\n  try {\n    const currentDir = process.cwd();\n\n    const hasTsConfig = fs.existsSync(path.join(currentDir, \"tsconfig.json\"));\n\n    const hasAppTs = fs.existsSync(path.join(currentDir, \"src\", \"app.ts\"));\n    const hasAppJs = fs.existsSync(path.join(currentDir, \"src\", \"app.js\"));\n\n    const isBuildMode = process.env.ARKOS_BUILD === \"true\";\n\n    if (isBuildMode) userFileExtension = \"js\";\n    else if (hasTsConfig && hasAppTs) userFileExtension = \"ts\";\n    else if (hasAppTs && !hasAppJs) userFileExtension = \"ts\";\n    else if (hasAppJs) userFileExtension = \"js\";\n    else userFileExtension = \"js\";\n\n    return userFileExtension;\n  } catch (e) {\n    userFileExtension = \"js\";\n    return userFileExtension;\n  }\n};\n\n/**\n * Checks if a file exists at the specified file path.\n *\n * @param filePath - The path to the file to check\n * @returns {boolean} True if the file exists, false otherwise or if there's an error\n *\n * @example\n * ```ts\n * const exists = checkFileExists('./path/to/file.txt');\n * if (exists) {\n *   console.info('File exists!');\n * }\n * ```\n */\nexport function checkFileExists(filePath: string): boolean {\n  try {\n    return fs.existsSync(path.resolve(filePath));\n  } catch (error) {\n    return false;\n  }\n}\n"]}

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

@@ -92,6 +92,18 @@ export const generateCommand = {
             fileSuffix: "hooks",
         });
     },
+    createDto: async (options) => {
+        await generateFile(options, {
+            templateName: "create-dto",
+            fileSuffix: "dto",
+        });
+    },
+    updateDto: async (options) => {
+        await generateFile(options, {
+            templateName: "update-dto",
+            fileSuffix: "dto",
+        });
+    },
     queryOptions: async (options) => {
         await generateFile(options, {
             templateName: "query-options",

package/dist/esm/utils/cli/generate.js.map

@@ -1 +1 @@
-{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../../src/utils/cli/generate.ts"],"names":[],"mappings":"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","sourcesContent":["import fs from \"fs\";\nimport path from \"path\";\nimport { generateTemplate } from \"./utils/template-generators\";\nimport { ensureDirectoryExists } from \"./utils/cli.helpers\";\nimport {\n  camelCase,\n  kebabCase,\n  pascalCase,\n} from \"../helpers/change-case.helpers\";\nimport { fullCleanCwd, getUserFileExtension } from \"../helpers/fs.helpers\";\nimport sheu from \"../sheu\";\nimport { capitalize } from \"../helpers/text.helpers\";\n\ninterface GenerateOptions {\n  path?: string;\n  model: string;\n}\n\ninterface GenerateConfig {\n  templateName: string;\n  fileSuffix: string;\n  customValidation?: (modelName: string) => void;\n  customImports?: (names: any) => any;\n}\n\nconst generateFile = async (\n  options: GenerateOptions,\n  config: GenerateConfig\n) => {\n  const modelName = options.model;\n\n  if (!modelName) {\n    sheu.error(\"Module name is required!\");\n    process.exit(1);\n  }\n\n  if (config.customValidation) config.customValidation(modelName);\n\n  const { path: customPath = \"src/modules\" } = options;\n\n  const names = {\n    pascal: pascalCase(modelName),\n    camel: camelCase(modelName),\n    kebab: kebabCase(modelName),\n  };\n\n  const ext = getUserFileExtension();\n  const modulePath = path.join(process.cwd(), customPath, names.kebab);\n  const filePath = path.join(\n    modulePath,\n    `${names.kebab}.${config.fileSuffix}.${ext}`\n  );\n  const humamReadableTemplateName =\n    config.templateName.charAt(0).toUpperCase() +\n    config.templateName.slice(1).replaceAll(\"-\", \" \");\n\n  try {\n    ensureDirectoryExists(modulePath);\n\n    const templateData = {\n      modelName: names,\n      ...(config.customImports && { imports: config.customImports(names) }),\n    };\n\n    const content = generateTemplate(config.templateName, templateData);\n    if (fs.existsSync(filePath))\n      throw new Error(\n        `${capitalize(humamReadableTemplateName.toLowerCase())} for ${options.model} already exists.`\n      );\n    fs.writeFileSync(filePath, content);\n\n    console.info(\"\");\n    sheu.done(\n      `${humamReadableTemplateName} for ${options.model} generated under ${fullCleanCwd(filePath)}`\n    );\n  } catch (err: any) {\n    console.info(\"\");\n    sheu.error(\n      `${`Failed to generate ${humamReadableTemplateName.toLowerCase()}`} for ${options.model} ${filePath ? \"under \" + fullCleanCwd(filePath) + \".\" : \".\"}`\n    );\n    console.info(`${sheu.bold(\"Reason: \")}${err?.message || \"unknown\"}`);\n    process.exit(1);\n  }\n};\n\nexport const generateCommand = {\n  controller: async (options: GenerateOptions) => {\n    await generateFile(options, {\n      templateName: \"controller\",\n      fileSuffix: \"controller\",\n      customImports: () => ({\n        baseController: \"arkos/controllers\",\n      }),\n    });\n  },\n\n  service: async (options: GenerateOptions) => {\n    await generateFile(options, {\n      templateName: \"service\",\n      fileSuffix: \"service\",\n      customImports: () => ({\n        baseService: \"arkos/services\",\n      }),\n    });\n  },\n\n  router: async (options: GenerateOptions) => {\n    await generateFile(options, {\n      templateName: \"router\",\n      fileSuffix: \"router\",\n      customImports: (names) => ({\n        baseRouter: \"arkos\",\n        controller: `./${names.kebab}.controller`,\n      }),\n    });\n  },\n\n  interceptors: async (options: GenerateOptions) => {\n    await generateFile(options, {\n      templateName: \"interceptors\",\n      fileSuffix: \"middlewares\",\n    });\n  },\n\n  authConfigs: async (options: GenerateOptions) => {\n    await generateFile(options, {\n      templateName: \"auth-configs\",\n      fileSuffix: \"auth\",\n    });\n  },\n\n  hooks: async (options: GenerateOptions) => {\n    await generateFile(options, {\n      templateName: \"hooks\",\n      fileSuffix: \"hooks\",\n    });\n  },\n\n  queryOptions: async (options: GenerateOptions) => {\n    await generateFile(options, {\n      templateName: \"query-options\",\n      fileSuffix: \"query\",\n      customValidation: (modelName) => {\n        if (modelName === \"file-upload\") {\n          sheu.error(\n            \"Prisma query options are not available to file-upload resource\"\n          );\n          process.exit(1);\n        }\n      },\n    });\n  },\n};\n"]}
+{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../../src/utils/cli/generate.ts"],"names":[],"mappings":"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","sourcesContent":["import fs from \"fs\";\nimport path from \"path\";\nimport { generateTemplate } from \"./utils/template-generators\";\nimport { ensureDirectoryExists } from \"./utils/cli.helpers\";\nimport {\n  camelCase,\n  kebabCase,\n  pascalCase,\n} from \"../helpers/change-case.helpers\";\nimport { fullCleanCwd, getUserFileExtension } from \"../helpers/fs.helpers\";\nimport sheu from \"../sheu\";\nimport { capitalize } from \"../helpers/text.helpers\";\n\ninterface GenerateOptions {\n  path?: string;\n  model: string;\n}\n\ninterface GenerateConfig {\n  templateName: string;\n  fileSuffix: string;\n  customValidation?: (modelName: string) => void;\n  customImports?: (names: any) => any;\n}\n\nconst generateFile = async (\n  options: GenerateOptions,\n  config: GenerateConfig\n) => {\n  const modelName = options.model;\n\n  if (!modelName) {\n    sheu.error(\"Module name is required!\");\n    process.exit(1);\n  }\n\n  if (config.customValidation) config.customValidation(modelName);\n\n  const { path: customPath = \"src/modules\" } = options;\n\n  const names = {\n    pascal: pascalCase(modelName),\n    camel: camelCase(modelName),\n    kebab: kebabCase(modelName),\n  };\n\n  const ext = getUserFileExtension();\n  const modulePath = path.join(process.cwd(), customPath, names.kebab);\n  const filePath = path.join(\n    modulePath,\n    `${names.kebab}.${config.fileSuffix}.${ext}`\n  );\n  const humamReadableTemplateName =\n    config.templateName.charAt(0).toUpperCase() +\n    config.templateName.slice(1).replaceAll(\"-\", \" \");\n\n  try {\n    ensureDirectoryExists(modulePath);\n\n    const templateData = {\n      modelName: names,\n      ...(config.customImports && { imports: config.customImports(names) }),\n    };\n\n    const content = generateTemplate(config.templateName, templateData);\n    if (fs.existsSync(filePath))\n      throw new Error(\n        `${capitalize(humamReadableTemplateName.toLowerCase())} for ${options.model} already exists.`\n      );\n    fs.writeFileSync(filePath, content);\n\n    console.info(\"\");\n    sheu.done(\n      `${humamReadableTemplateName} for ${options.model} generated under ${fullCleanCwd(filePath)}`\n    );\n  } catch (err: any) {\n    console.info(\"\");\n    sheu.error(\n      `${`Failed to generate ${humamReadableTemplateName.toLowerCase()}`} for ${options.model} ${filePath ? \"under \" + fullCleanCwd(filePath) + \".\" : \".\"}`\n    );\n    console.info(`${sheu.bold(\"Reason: \")}${err?.message || \"unknown\"}`);\n    process.exit(1);\n  }\n};\n\nexport const generateCommand = {\n  controller: async (options: GenerateOptions) => {\n    await generateFile(options, {\n      templateName: \"controller\",\n      fileSuffix: \"controller\",\n      customImports: () => ({\n        baseController: \"arkos/controllers\",\n      }),\n    });\n  },\n\n  service: async (options: GenerateOptions) => {\n    await generateFile(options, {\n      templateName: \"service\",\n      fileSuffix: \"service\",\n      customImports: () => ({\n        baseService: \"arkos/services\",\n      }),\n    });\n  },\n\n  router: async (options: GenerateOptions) => {\n    await generateFile(options, {\n      templateName: \"router\",\n      fileSuffix: \"router\",\n      customImports: (names) => ({\n        baseRouter: \"arkos\",\n        controller: `./${names.kebab}.controller`,\n      }),\n    });\n  },\n\n  interceptors: async (options: GenerateOptions) => {\n    await generateFile(options, {\n      templateName: \"interceptors\",\n      fileSuffix: \"middlewares\",\n    });\n  },\n\n  authConfigs: async (options: GenerateOptions) => {\n    await generateFile(options, {\n      templateName: \"auth-configs\",\n      fileSuffix: \"auth\",\n    });\n  },\n\n  hooks: async (options: GenerateOptions) => {\n    await generateFile(options, {\n      templateName: \"hooks\",\n      fileSuffix: \"hooks\",\n    });\n  },\n\n  createDto: async (options: GenerateOptions) => {\n    await generateFile(options, {\n      templateName: \"create-dto\",\n      fileSuffix: \"dto\",\n    });\n  },\n\n  updateDto: async (options: GenerateOptions) => {\n    await generateFile(options, {\n      templateName: \"update-dto\",\n      fileSuffix: \"dto\",\n    });\n  },\n\n  queryOptions: async (options: GenerateOptions) => {\n    await generateFile(options, {\n      templateName: \"query-options\",\n      fileSuffix: \"query\",\n      customValidation: (modelName) => {\n        if (modelName === \"file-upload\") {\n          sheu.error(\n            \"Prisma query options are not available to file-upload resource\"\n          );\n          process.exit(1);\n        }\n      },\n    });\n  },\n};\n"]}

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

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

package/dist/esm/utils/features/api.features.js

@@ -179,27 +179,27 @@ export default class APIFeatures {
         return this;
     }
     _validateNoPasswordExposure(select, include, omit) {
-        const checkForPassword = (obj, path = []) => {
+        const checkForPassword = (obj, prismaKey, path = []) => {
             for (const [key, value] of Object.entries(obj)) {
                 const currentPath = [...path, key];
                 if (key === "password" &&
                     (this.modelName?.toLowerCase() === "user" ||
                         currentPath.at(-3)?.toLowerCase?.() === "user")) {
-                    if (value === false)
+                    if (value === false && prismaKey === "omit")
                         throw new AppError("Cannot disable password omission protection", 400, { ...obj }, "CannotExposeUserPassword");
-                    if (value === true && !omit?.["password"])
+                    if (value === true && ["include", "select"].includes(prismaKey))
                         throw new AppError("User password exposure detected", 403, {}, "UserPasswordExposureDetected");
                 }
                 if (typeof value === "object" &&
                     value !== null &&
                     !Array.isArray(value)) {
-                    checkForPassword(value, currentPath);
+                    checkForPassword(value, prismaKey, currentPath);
                 }
             }
         };
-        checkForPassword(select);
-        checkForPassword(include);
-        checkForPassword(omit);
+        checkForPassword(select, "select");
+        checkForPassword(include, "include");
+        checkForPassword(omit, "omit");
     }
     paginate() {
         const paginationOptions = (() => {

package/dist/esm/utils/features/api.features.js.map

@@ -1 +1 @@
-{"version":3,"file":"api.features.js","sourceRoot":"","sources":["../../../../src/utils/features/api.features.ts"],"names":[],"mappings":"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","sourcesContent":["import { Request } from \"express\";\nimport deepmerge from \"../helpers/deepmerge.helper\";\nimport { parseQueryParamsWithModifiers } from \"../helpers/api.features.helpers\";\nimport AppError from \"../../modules/error-handler/utils/app-error\";\nimport { getPrismaInstance } from \"../helpers/prisma.helpers\";\nimport { ArkosRequest } from \"../../types\";\nimport debuggerService from \"../../modules/debugger/debugger.service\";\n\ntype ModelName = string;\n\nexport default class APIFeatures {\n  req?: ArkosRequest;\n  searchParams: any;\n  searchParamsWithModifiers: any;\n  filters: Record<string, any> = {};\n  reqFiltersSearchParam: any = {};\n  modelName?: ModelName;\n  excludedFields = [\n    \"page\",\n    \"filters\",\n    \"sort\",\n    \"limit\",\n    \"fields\",\n    \"addFields\",\n    \"removeFields\",\n    \"search\",\n    \"include\",\n    \"filterMode\",\n    \"where\",\n    \"prismaQueryOptions\",\n    \"ignoredFields\",\n    \"select\",\n    \"omit\",\n  ];\n\n  constructor(req?: Request, modelName?: ModelName) {\n    if (req) {\n      const { filters = \"{}\", ...restOfQuery } = req.query;\n      this.req = req;\n\n      let parsedFilters = {};\n      try {\n        parsedFilters = JSON.parse(filters as string);\n      } catch (error) {\n        throw new AppError(\"Invalid req.query.filters JSON format\", 400);\n      }\n\n      this.searchParams = deepmerge(\n        parseQueryParamsWithModifiers(restOfQuery),\n        parseQueryParamsWithModifiers(parsedFilters)\n      );\n\n      debuggerService.handleTransformedQueryLog(this.searchParams);\n    }\n\n    if (modelName) this.modelName = modelName;\n    this.filters = { ...this.filters };\n  }\n\n  filter() {\n    if (!this.req)\n      throw new Error(\n        \"Trying to use APIFeatures.filter() without passing request on class constructor or APIFeatures.setup() method.\"\n      );\n\n    const searchableFields: Record<string, any>[] = [];\n    const queryObj = { ...this.searchParams };\n\n    this.excludedFields.forEach((el) => delete queryObj[el]);\n\n    const topLevelOR = queryObj.OR;\n    const topLevelAND = queryObj.AND;\n    delete queryObj.OR;\n    delete queryObj.AND;\n\n    const whereObj = { ...this.req.params, ...queryObj };\n    const whereLogicalOperatorFilters = Object.keys(whereObj).map((key) => ({\n      [key]: whereObj[key],\n    }));\n\n    let whereOptions: any = {};\n\n    if (whereLogicalOperatorFilters.length > 0) {\n      whereOptions = {\n        [(this.req.query?.filterMode as string) ?? \"OR\"]:\n          whereLogicalOperatorFilters,\n      };\n    }\n\n    if (topLevelOR) {\n      if (whereOptions.OR) {\n        whereOptions.OR = [...whereOptions.OR, ...topLevelOR];\n      } else {\n        whereOptions.OR = topLevelOR;\n      }\n    }\n\n    if (topLevelAND) {\n      if (whereOptions.AND) {\n        whereOptions.AND = [...whereOptions.AND, ...topLevelAND];\n      } else {\n        whereOptions.AND = topLevelAND;\n      }\n    }\n\n    if (!!this.searchParams.search) {\n      const prisma = getPrismaInstance();\n\n      if (!this.modelName)\n        throw new Error(\"Model name is required for search functionality\");\n\n      if (!prisma[this.modelName] || !prisma[this.modelName].fields)\n        throw new Error(`Model '${this.modelName}' not found or has no fields`);\n\n      Object.keys((prisma as any)[this.modelName].fields).forEach((key) => {\n        const field = ((prisma as any)[this.modelName!].fields as any)[key];\n        if (\n          field?.typeName === \"String\" &&\n          key !== \"id\" &&\n          key !== \"password\" &&\n          !field.isList &&\n          !key?.includes?.(\"Id\") &&\n          !key?.includes?.(\"ID\")\n        ) {\n          searchableFields.push({\n            [`${key}`]: {\n              contains: this.searchParams.search,\n              mode: \"insensitive\",\n            },\n          });\n        }\n      });\n\n      if (searchableFields.length > 0) {\n        whereOptions = deepmerge(\n          {\n            OR: searchableFields,\n          },\n          whereOptions\n        );\n      }\n    }\n\n    const firstMerge = deepmerge(\n      {\n        where: whereOptions,\n      },\n      this.req.prismaQueryOptions || {}\n    );\n\n    this.filters = deepmerge(firstMerge, this.filters);\n    this.searchParams = deepmerge(\n      this.searchParams || {},\n      this.req.prismaQueryOptions || {}\n    );\n\n    return this;\n  }\n\n  sort() {\n    if (this.searchParams.sort) {\n      const sortBy = this.searchParams?.sort\n        ?.split(\",\")\n        ?.map((field: string) => ({\n          [field.startsWith(\"-\") ? field.substring(1) : field]:\n            field.startsWith(\"-\") ? \"desc\" : \"asc\",\n        }));\n      this.filters = deepmerge(this.filters, { orderBy: sortBy });\n    }\n\n    return this;\n  }\n\n  limitFields() {\n    let finalSelect: Record<string, any> = {};\n    let finalInclude: Record<string, any> = {};\n    let finalOmit: Record<string, any> = {};\n\n    if (this.searchParams?.fields) {\n      const fields = this.searchParams.fields.split(\",\");\n\n      const regularFields = fields.filter(\n        (field: string) => !field.startsWith(\"+\") && !field.startsWith(\"-\")\n      );\n      const includeFields = fields\n        .filter((field: string) => field.startsWith(\"+\"))\n        .map((field: string) => field.substring(1));\n      const excludeFields = fields\n        .filter((field: string) => field.startsWith(\"-\"))\n        .map((field: string) => field.substring(1));\n\n      if (regularFields.length > 0) {\n        finalSelect = regularFields.reduce(\n          (acc: Record<string, any>, field: string) => {\n            acc[field] = true;\n            return acc;\n          },\n          {} as Record<string, any>\n        );\n      }\n\n      includeFields.forEach((field: string) => {\n        finalInclude[field] = true;\n      });\n\n      excludeFields.forEach((field: string) => {\n        finalOmit[field] = true;\n      });\n    }\n\n    if (this.searchParams.include || this.filters.include)\n      finalInclude = deepmerge(\n        finalInclude,\n        deepmerge(this.filters?.include || {}, this.searchParams?.include || {})\n      );\n\n    if (this.searchParams.select || this.filters.include)\n      finalSelect = deepmerge(\n        finalSelect,\n        deepmerge(this.filters?.select || {}, this.searchParams?.select || {})\n      );\n\n    if (this.searchParams.omit || this.filters.omit)\n      finalOmit = deepmerge(\n        finalOmit,\n        deepmerge(this.filters?.omit || {}, this.searchParams?.omit || {})\n      );\n\n    if (\n      Object.keys(finalSelect).length > 0 &&\n      Object.keys(finalInclude).length > 0\n    ) {\n      finalSelect = deepmerge(finalSelect, finalInclude);\n      finalInclude = {};\n      delete this.filters.include;\n      delete this.searchParams.include;\n    }\n\n    this._validateNoPasswordExposure(finalSelect, finalInclude, finalOmit);\n\n    // ALWAYS protect password field in finalOmit\n    if (finalOmit.password === false)\n      throw new AppError(\"Cannot disable password omission protection\", 400);\n\n    if (this.modelName?.toLowerCase?.() === \"user\") finalOmit.password = true;\n\n    if (Object.keys(finalSelect).length > 0) this.filters.select = finalSelect;\n\n    if (Object.keys(finalInclude).length > 0)\n      this.filters.include = finalInclude;\n\n    if (Object.keys(finalOmit).length > 0) this.filters.omit = finalOmit;\n\n    if (this.searchParams?.addFields || this.searchParams?.removeFields) {\n      throw new AppError(\n        \"The addFields and removeFields parameters are deprecated.\",\n        400\n      );\n    }\n\n    return this;\n  }\n\n  private _validateNoPasswordExposure(\n    select: Record<string, any>,\n    include: Record<string, any>,\n    omit: Record<string, any>\n  ) {\n    const checkForPassword = (\n      obj: Record<string, any>,\n      path: string[] = []\n    ) => {\n      for (const [key, value] of Object.entries(obj)) {\n        const currentPath = [...path, key];\n\n        if (\n          key === \"password\" &&\n          (this.modelName?.toLowerCase() === \"user\" ||\n            currentPath.at(-3)?.toLowerCase?.() === \"user\")\n        ) {\n          if (value === false)\n            throw new AppError(\n              \"Cannot disable password omission protection\",\n              400,\n              { ...obj },\n              \"CannotExposeUserPassword\"\n            );\n\n          if (value === true && !omit?.[\"password\"])\n            throw new AppError(\n              \"User password exposure detected\",\n              403,\n              {},\n              \"UserPasswordExposureDetected\"\n            );\n        }\n\n        if (\n          typeof value === \"object\" &&\n          value !== null &&\n          !Array.isArray(value)\n        ) {\n          checkForPassword(value, currentPath);\n        }\n      }\n    };\n\n    checkForPassword(select);\n    checkForPassword(include);\n    checkForPassword(omit);\n  }\n\n  paginate(): APIFeatures {\n    const paginationOptions = (() => {\n      if (this.searchParams.limit === \"all\") return {};\n\n      const page = parseInt(this.searchParams.page, 10) || 1;\n      const limit = parseInt(this.searchParams.limit, 10) || 30;\n      const skip = (page - 1) * limit;\n\n      return { skip, take: limit };\n    })();\n\n    this.filters = {\n      ...this.filters,\n      ...paginationOptions,\n    };\n    return this;\n  }\n}\n"]}
+{"version":3,"file":"api.features.js","sourceRoot":"","sources":["../../../../src/utils/features/api.features.ts"],"names":[],"mappings":"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","sourcesContent":["import { Request } from \"express\";\nimport deepmerge from \"../helpers/deepmerge.helper\";\nimport { parseQueryParamsWithModifiers } from \"../helpers/api.features.helpers\";\nimport AppError from \"../../modules/error-handler/utils/app-error\";\nimport { getPrismaInstance } from \"../helpers/prisma.helpers\";\nimport { ArkosRequest } from \"../../types\";\nimport debuggerService from \"../../modules/debugger/debugger.service\";\n\ntype ModelName = string;\n\nexport default class APIFeatures {\n  req?: ArkosRequest;\n  searchParams: any;\n  searchParamsWithModifiers: any;\n  filters: Record<string, any> = {};\n  reqFiltersSearchParam: any = {};\n  modelName?: ModelName;\n  excludedFields = [\n    \"page\",\n    \"filters\",\n    \"sort\",\n    \"limit\",\n    \"fields\",\n    \"addFields\",\n    \"removeFields\",\n    \"search\",\n    \"include\",\n    \"filterMode\",\n    \"where\",\n    \"prismaQueryOptions\",\n    \"ignoredFields\",\n    \"select\",\n    \"omit\",\n  ];\n\n  constructor(req?: Request, modelName?: ModelName) {\n    if (req) {\n      const { filters = \"{}\", ...restOfQuery } = req.query;\n      this.req = req;\n\n      let parsedFilters = {};\n      try {\n        parsedFilters = JSON.parse(filters as string);\n      } catch (error) {\n        throw new AppError(\"Invalid req.query.filters JSON format\", 400);\n      }\n\n      this.searchParams = deepmerge(\n        parseQueryParamsWithModifiers(restOfQuery),\n        parseQueryParamsWithModifiers(parsedFilters)\n      );\n\n      debuggerService.handleTransformedQueryLog(this.searchParams);\n    }\n\n    if (modelName) this.modelName = modelName;\n    this.filters = { ...this.filters };\n  }\n\n  filter() {\n    if (!this.req)\n      throw new Error(\n        \"Trying to use APIFeatures.filter() without passing request on class constructor or APIFeatures.setup() method.\"\n      );\n\n    const searchableFields: Record<string, any>[] = [];\n    const queryObj = { ...this.searchParams };\n\n    this.excludedFields.forEach((el) => delete queryObj[el]);\n\n    const topLevelOR = queryObj.OR;\n    const topLevelAND = queryObj.AND;\n    delete queryObj.OR;\n    delete queryObj.AND;\n\n    const whereObj = { ...this.req.params, ...queryObj };\n    const whereLogicalOperatorFilters = Object.keys(whereObj).map((key) => ({\n      [key]: whereObj[key],\n    }));\n\n    let whereOptions: any = {};\n\n    if (whereLogicalOperatorFilters.length > 0) {\n      whereOptions = {\n        [(this.req.query?.filterMode as string) ?? \"OR\"]:\n          whereLogicalOperatorFilters,\n      };\n    }\n\n    if (topLevelOR) {\n      if (whereOptions.OR) {\n        whereOptions.OR = [...whereOptions.OR, ...topLevelOR];\n      } else {\n        whereOptions.OR = topLevelOR;\n      }\n    }\n\n    if (topLevelAND) {\n      if (whereOptions.AND) {\n        whereOptions.AND = [...whereOptions.AND, ...topLevelAND];\n      } else {\n        whereOptions.AND = topLevelAND;\n      }\n    }\n\n    if (!!this.searchParams.search) {\n      const prisma = getPrismaInstance();\n\n      if (!this.modelName)\n        throw new Error(\"Model name is required for search functionality\");\n\n      if (!prisma[this.modelName] || !prisma[this.modelName].fields)\n        throw new Error(`Model '${this.modelName}' not found or has no fields`);\n\n      Object.keys((prisma as any)[this.modelName].fields).forEach((key) => {\n        const field = ((prisma as any)[this.modelName!].fields as any)[key];\n        if (\n          field?.typeName === \"String\" &&\n          key !== \"id\" &&\n          key !== \"password\" &&\n          !field.isList &&\n          !key?.includes?.(\"Id\") &&\n          !key?.includes?.(\"ID\")\n        ) {\n          searchableFields.push({\n            [`${key}`]: {\n              contains: this.searchParams.search,\n              mode: \"insensitive\",\n            },\n          });\n        }\n      });\n\n      if (searchableFields.length > 0) {\n        whereOptions = deepmerge(\n          {\n            OR: searchableFields,\n          },\n          whereOptions\n        );\n      }\n    }\n\n    const firstMerge = deepmerge(\n      {\n        where: whereOptions,\n      },\n      this.req.prismaQueryOptions || {}\n    );\n\n    this.filters = deepmerge(firstMerge, this.filters);\n    this.searchParams = deepmerge(\n      this.searchParams || {},\n      this.req.prismaQueryOptions || {}\n    );\n\n    return this;\n  }\n\n  sort() {\n    if (this.searchParams.sort) {\n      const sortBy = this.searchParams?.sort\n        ?.split(\",\")\n        ?.map((field: string) => ({\n          [field.startsWith(\"-\") ? field.substring(1) : field]:\n            field.startsWith(\"-\") ? \"desc\" : \"asc\",\n        }));\n      this.filters = deepmerge(this.filters, { orderBy: sortBy });\n    }\n\n    return this;\n  }\n\n  limitFields() {\n    let finalSelect: Record<string, any> = {};\n    let finalInclude: Record<string, any> = {};\n    let finalOmit: Record<string, any> = {};\n\n    if (this.searchParams?.fields) {\n      const fields = this.searchParams.fields.split(\",\");\n\n      const regularFields = fields.filter(\n        (field: string) => !field.startsWith(\"+\") && !field.startsWith(\"-\")\n      );\n      const includeFields = fields\n        .filter((field: string) => field.startsWith(\"+\"))\n        .map((field: string) => field.substring(1));\n      const excludeFields = fields\n        .filter((field: string) => field.startsWith(\"-\"))\n        .map((field: string) => field.substring(1));\n\n      if (regularFields.length > 0) {\n        finalSelect = regularFields.reduce(\n          (acc: Record<string, any>, field: string) => {\n            acc[field] = true;\n            return acc;\n          },\n          {} as Record<string, any>\n        );\n      }\n\n      includeFields.forEach((field: string) => {\n        finalInclude[field] = true;\n      });\n\n      excludeFields.forEach((field: string) => {\n        finalOmit[field] = true;\n      });\n    }\n\n    if (this.searchParams.include || this.filters.include)\n      finalInclude = deepmerge(\n        finalInclude,\n        deepmerge(this.filters?.include || {}, this.searchParams?.include || {})\n      );\n\n    if (this.searchParams.select || this.filters.include)\n      finalSelect = deepmerge(\n        finalSelect,\n        deepmerge(this.filters?.select || {}, this.searchParams?.select || {})\n      );\n\n    if (this.searchParams.omit || this.filters.omit)\n      finalOmit = deepmerge(\n        finalOmit,\n        deepmerge(this.filters?.omit || {}, this.searchParams?.omit || {})\n      );\n\n    if (\n      Object.keys(finalSelect).length > 0 &&\n      Object.keys(finalInclude).length > 0\n    ) {\n      finalSelect = deepmerge(finalSelect, finalInclude);\n      finalInclude = {};\n      delete this.filters.include;\n      delete this.searchParams.include;\n    }\n\n    this._validateNoPasswordExposure(finalSelect, finalInclude, finalOmit);\n\n    // ALWAYS protect password field in finalOmit\n    if (finalOmit.password === false)\n      throw new AppError(\"Cannot disable password omission protection\", 400);\n\n    if (this.modelName?.toLowerCase?.() === \"user\") finalOmit.password = true;\n\n    if (Object.keys(finalSelect).length > 0) this.filters.select = finalSelect;\n\n    if (Object.keys(finalInclude).length > 0)\n      this.filters.include = finalInclude;\n\n    if (Object.keys(finalOmit).length > 0) this.filters.omit = finalOmit;\n\n    if (this.searchParams?.addFields || this.searchParams?.removeFields) {\n      throw new AppError(\n        \"The addFields and removeFields parameters are deprecated.\",\n        400\n      );\n    }\n\n    return this;\n  }\n\n  private _validateNoPasswordExposure(\n    select: Record<string, any>,\n    include: Record<string, any>,\n    omit: Record<string, any>\n  ) {\n    const checkForPassword = (\n      obj: Record<string, any>,\n      prismaKey: string,\n      path: string[] = []\n    ) => {\n      for (const [key, value] of Object.entries(obj)) {\n        const currentPath = [...path, key];\n\n        if (\n          key === \"password\" &&\n          (this.modelName?.toLowerCase() === \"user\" ||\n            currentPath.at(-3)?.toLowerCase?.() === \"user\")\n        ) {\n          if (value === false && prismaKey === \"omit\")\n            throw new AppError(\n              \"Cannot disable password omission protection\",\n              400,\n              { ...obj },\n              \"CannotExposeUserPassword\"\n            );\n\n          if (value === true && [\"include\", \"select\"].includes(prismaKey))\n            throw new AppError(\n              \"User password exposure detected\",\n              403,\n              {},\n              \"UserPasswordExposureDetected\"\n            );\n        }\n\n        if (\n          typeof value === \"object\" &&\n          value !== null &&\n          !Array.isArray(value)\n        ) {\n          checkForPassword(value, prismaKey, currentPath);\n        }\n      }\n    };\n\n    checkForPassword(select, \"select\");\n    checkForPassword(include, \"include\");\n    checkForPassword(omit, \"omit\");\n  }\n\n  paginate(): APIFeatures {\n    const paginationOptions = (() => {\n      if (this.searchParams.limit === \"all\") return {};\n\n      const page = parseInt(this.searchParams.page, 10) || 1;\n      const limit = parseInt(this.searchParams.limit, 10) || 30;\n      const skip = (page - 1) * limit;\n\n      return { skip, take: limit };\n    })();\n\n    this.filters = {\n      ...this.filters,\n      ...paginationOptions,\n    };\n    return this;\n  }\n}\n"]}

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

@@ -6,7 +6,15 @@ export const crd = () => process.env.ARKOS_BUILD === "true"
 export function fullCleanCwd(path) {
     if (typeof path !== "string")
         throw new Error("Path must be a string");
-    return path.replace(process.cwd(), "").replace("/", "").replace("\\", "");
+    if (path.startsWith(`/${process.cwd()}`) ||
+        path.startsWith(`${process.cwd()}`) ||
+        path.startsWith(`${process.cwd()}/`))
+        return path
+            .replace(process.cwd(), "")
+            .replace(/^\/+/g, "")
+            .replace("\\", "");
+    else
+        return path;
 }
 export let userFileExtension;
 export const getUserFileExtension = () => {

package/dist/esm/utils/helpers/fs.helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"fs.helpers.js","sourceRoot":"","sources":["../../../../src/utils/helpers/fs.helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,MAAM,CAAC,MAAM,GAAG,GAAG,GAAG,EAAE,CACtB,OAAO,CAAC,GAAG,CAAC,WAAW,KAAK,MAAM;IAChC,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,UAAU;IAC5B,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;AAQpB,MAAM,UAAU,YAAY,CAAC,IAAY;IACvC,IAAI,OAAO,IAAI,KAAK,QAAQ;QAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;IAEvE,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;AAC5E,CAAC;AAED,MAAM,CAAC,IAAI,iBAA0C,CAAC;AAOtD,MAAM,CAAC,MAAM,oBAAoB,GAAG,GAAgB,EAAE;IACpD,IAAI,iBAAiB;QAAE,OAAO,iBAAiB,CAAC;IAEhD,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;QAEjC,MAAM,WAAW,GAAG,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC,CAAC;QAE1E,MAAM,QAAQ,GAAG,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;QACvE,MAAM,QAAQ,GAAG,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;QAEvE,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,KAAK,MAAM,CAAC;QAEvD,IAAI,WAAW;YAAE,iBAAiB,GAAG,IAAI,CAAC;aACrC,IAAI,WAAW,IAAI,QAAQ;YAAE,iBAAiB,GAAG,IAAI,CAAC;aACtD,IAAI,QAAQ,IAAI,CAAC,QAAQ;YAAE,iBAAiB,GAAG,IAAI,CAAC;aACpD,IAAI,QAAQ;YAAE,iBAAiB,GAAG,IAAI,CAAC;;YACvC,iBAAiB,GAAG,IAAI,CAAC;QAE9B,OAAO,iBAAiB,CAAC;IAC3B,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,iBAAiB,GAAG,IAAI,CAAC;QACzB,OAAO,iBAAiB,CAAC;IAC3B,CAAC;AACH,CAAC,CAAC;AAgBF,MAAM,UAAU,eAAe,CAAC,QAAgB;IAC9C,IAAI,CAAC;QACH,OAAO,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC/C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC","sourcesContent":["import fs from \"fs\";\nimport path from \"path\";\n\nexport const crd = () =>\n  process.env.ARKOS_BUILD === \"true\"\n    ? process.cwd() + \"/.build/\"\n    : process.cwd();\n\n/**\n * Removes the current working directory prefix from the given path.\n * Handles cases with or without a trailing slash in cwd.\n * @param path - The path to clean\n * @returns The path without the cwd prefix\n */\nexport function fullCleanCwd(path: string): string {\n  if (typeof path !== \"string\") throw new Error(\"Path must be a string\");\n\n  return path.replace(process.cwd(), \"\").replace(\"/\", \"\").replace(\"\\\\\", \"\");\n}\n\nexport let userFileExtension: \"ts\" | \"js\" | undefined;\n\n/**\n * Detects the file extension that should be used in the current execution context\n * Returns 'ts' when TypeScript config exists and not in build mode, otherwise 'js'\n * @returns 'ts' | 'js'\n */\nexport const getUserFileExtension = (): \"ts\" | \"js\" => {\n  if (userFileExtension) return userFileExtension;\n\n  try {\n    const currentDir = process.cwd();\n\n    const hasTsConfig = fs.existsSync(path.join(currentDir, \"tsconfig.json\"));\n\n    const hasAppTs = fs.existsSync(path.join(currentDir, \"src\", \"app.ts\"));\n    const hasAppJs = fs.existsSync(path.join(currentDir, \"src\", \"app.js\"));\n\n    const isBuildMode = process.env.ARKOS_BUILD === \"true\";\n\n    if (isBuildMode) userFileExtension = \"js\";\n    else if (hasTsConfig && hasAppTs) userFileExtension = \"ts\";\n    else if (hasAppTs && !hasAppJs) userFileExtension = \"ts\";\n    else if (hasAppJs) userFileExtension = \"js\";\n    else userFileExtension = \"js\";\n\n    return userFileExtension;\n  } catch (e) {\n    userFileExtension = \"js\";\n    return userFileExtension;\n  }\n};\n\n/**\n * Checks if a file exists at the specified file path.\n *\n * @param filePath - The path to the file to check\n * @returns {boolean} True if the file exists, false otherwise or if there's an error\n *\n * @example\n * ```ts\n * const exists = checkFileExists('./path/to/file.txt');\n * if (exists) {\n *   console.info('File exists!');\n * }\n * ```\n */\nexport function checkFileExists(filePath: string): boolean {\n  try {\n    return fs.existsSync(path.resolve(filePath));\n  } catch (error) {\n    return false;\n  }\n}\n"]}
+{"version":3,"file":"fs.helpers.js","sourceRoot":"","sources":["../../../../src/utils/helpers/fs.helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,MAAM,CAAC,MAAM,GAAG,GAAG,GAAG,EAAE,CACtB,OAAO,CAAC,GAAG,CAAC,WAAW,KAAK,MAAM;IAChC,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,UAAU;IAC5B,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;AAQpB,MAAM,UAAU,YAAY,CAAC,IAAY;IACvC,IAAI,OAAO,IAAI,KAAK,QAAQ;QAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;IAEvE,IACE,IAAI,CAAC,UAAU,CAAC,IAAI,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC;QACpC,IAAI,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC;QACnC,IAAI,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC;QAEpC,OAAO,IAAI;aACR,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE,CAAC;aAC1B,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;aACpB,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;;QAClB,OAAO,IAAI,CAAC;AACnB,CAAC;AAED,MAAM,CAAC,IAAI,iBAA0C,CAAC;AAOtD,MAAM,CAAC,MAAM,oBAAoB,GAAG,GAAgB,EAAE;IACpD,IAAI,iBAAiB;QAAE,OAAO,iBAAiB,CAAC;IAEhD,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;QAEjC,MAAM,WAAW,GAAG,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC,CAAC;QAE1E,MAAM,QAAQ,GAAG,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;QACvE,MAAM,QAAQ,GAAG,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;QAEvE,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,KAAK,MAAM,CAAC;QAEvD,IAAI,WAAW;YAAE,iBAAiB,GAAG,IAAI,CAAC;aACrC,IAAI,WAAW,IAAI,QAAQ;YAAE,iBAAiB,GAAG,IAAI,CAAC;aACtD,IAAI,QAAQ,IAAI,CAAC,QAAQ;YAAE,iBAAiB,GAAG,IAAI,CAAC;aACpD,IAAI,QAAQ;YAAE,iBAAiB,GAAG,IAAI,CAAC;;YACvC,iBAAiB,GAAG,IAAI,CAAC;QAE9B,OAAO,iBAAiB,CAAC;IAC3B,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,iBAAiB,GAAG,IAAI,CAAC;QACzB,OAAO,iBAAiB,CAAC;IAC3B,CAAC;AACH,CAAC,CAAC;AAgBF,MAAM,UAAU,eAAe,CAAC,QAAgB;IAC9C,IAAI,CAAC;QACH,OAAO,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC/C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC","sourcesContent":["import fs from \"fs\";\nimport path from \"path\";\n\nexport const crd = () =>\n  process.env.ARKOS_BUILD === \"true\"\n    ? process.cwd() + \"/.build/\"\n    : process.cwd();\n\n/**\n * Removes the current working directory prefix from the given path.\n * Handles cases with or without a trailing slash in cwd.\n * @param path - The path to clean\n * @returns The path without the cwd prefix\n */\nexport function fullCleanCwd(path: string): string {\n  if (typeof path !== \"string\") throw new Error(\"Path must be a string\");\n\n  if (\n    path.startsWith(`/${process.cwd()}`) ||\n    path.startsWith(`${process.cwd()}`) ||\n    path.startsWith(`${process.cwd()}/`)\n  )\n    return path\n      .replace(process.cwd(), \"\")\n      .replace(/^\\/+/g, \"\")\n      .replace(\"\\\\\", \"\");\n  else return path;\n}\n\nexport let userFileExtension: \"ts\" | \"js\" | undefined;\n\n/**\n * Detects the file extension that should be used in the current execution context\n * Returns 'ts' when TypeScript config exists and not in build mode, otherwise 'js'\n * @returns 'ts' | 'js'\n */\nexport const getUserFileExtension = (): \"ts\" | \"js\" => {\n  if (userFileExtension) return userFileExtension;\n\n  try {\n    const currentDir = process.cwd();\n\n    const hasTsConfig = fs.existsSync(path.join(currentDir, \"tsconfig.json\"));\n\n    const hasAppTs = fs.existsSync(path.join(currentDir, \"src\", \"app.ts\"));\n    const hasAppJs = fs.existsSync(path.join(currentDir, \"src\", \"app.js\"));\n\n    const isBuildMode = process.env.ARKOS_BUILD === \"true\";\n\n    if (isBuildMode) userFileExtension = \"js\";\n    else if (hasTsConfig && hasAppTs) userFileExtension = \"ts\";\n    else if (hasAppTs && !hasAppJs) userFileExtension = \"ts\";\n    else if (hasAppJs) userFileExtension = \"js\";\n    else userFileExtension = \"js\";\n\n    return userFileExtension;\n  } catch (e) {\n    userFileExtension = \"js\";\n    return userFileExtension;\n  }\n};\n\n/**\n * Checks if a file exists at the specified file path.\n *\n * @param filePath - The path to the file to check\n * @returns {boolean} True if the file exists, false otherwise or if there's an error\n *\n * @example\n * ```ts\n * const exists = checkFileExists('./path/to/file.txt');\n * if (exists) {\n *   console.info('File exists!');\n * }\n * ```\n */\nexport function checkFileExists(filePath: string): boolean {\n  try {\n    return fs.existsSync(path.resolve(filePath));\n  } catch (error) {\n    return false;\n  }\n}\n"]}

package/dist/types/utils/cli/generate.d.ts

@@ -9,6 +9,8 @@ export declare const generateCommand: {
     interceptors: (options: GenerateOptions) => Promise<void>;
     authConfigs: (options: GenerateOptions) => Promise<void>;
     hooks: (options: GenerateOptions) => Promise<void>;
+    createDto: (options: GenerateOptions) => Promise<void>;
+    updateDto: (options: GenerateOptions) => Promise<void>;
     queryOptions: (options: GenerateOptions) => Promise<void>;
 };
 export {};

package/package.json

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