arkos 1.2.12-test → 1.2.13-beta

package/dist/cjs/utils/cli/utils/template-generator/templates/generate-prisma-query-options.js

@@ -39,16 +39,22 @@ export default ${modelName.camel}QueryOptions;
         return `${prismaImport}${imports};
 
 const ${modelName.camel}QueryOptions${typeAnnotation} = {
-  // for all queries
-  queryOptions: {},
-  findOne: {},
-  findMany: {},
-  deleteMany: {},
-  updateMany: {},
-  createMany: {},
-  createOne: {},
-  updateOne: {},
-  deleteOne: {},
+    global: {},
+    find: {},
+    findOne: {},
+    findMany: {},
+    udpate: {},
+    updateMany: {},
+    updateOne: {},
+    create: {},
+    createMany: {},
+    createOne: {},
+    save: {},
+    saveMany: {},
+    saveOne: {},
+    delete: {},
+    deleteMany: {},
+    deleteOne: {},
 }
 
 export default ${modelName.camel}QueryOptions;

package/dist/cjs/utils/cli/utils/template-generator/templates/generate-prisma-query-options.js.map

@@ -1 +1 @@
-{"version":3,"file":"generate-prisma-query-options.js","sourceRoot":"","sources":["../../../../../../../src/utils/cli/utils/template-generator/templates/generate-prisma-query-options.ts"],"names":[],"mappings":";;AAGA,oEA6DC;AAhED,+DAAsE;AAGtE,SAAgB,4BAA4B,CAAC,OAAwB;IACnE,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;IAC9B,MAAM,MAAM,GAAG,SAAS,EAAE,KAAK,KAAK,MAAM,CAAC;IAC3C,MAAM,GAAG,GAAG,IAAA,iCAAoB,GAAE,CAAC;IACnC,MAAM,YAAY,GAAG,GAAG,KAAK,IAAI,CAAC;IAElC,IAAI,CAAC,SAAS;QACZ,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;IAGtE,MAAM,OAAO,GAAG,MAAM;QACpB,CAAC,CAAC,uDAAuD;QACzD,CAAC,CAAC,mDAAmD,CAAC;IAGxD,MAAM,cAAc,GAAG,YAAY;QACjC,CAAC,CAAC,MAAM;YACN,CAAC,CAAC,0CAA0C,SAAS,CAAC,KAAK,GAAG;YAC9D,CAAC,CAAC,sCAAsC,SAAS,CAAC,KAAK,GAAG;QAC5D,CAAC,CAAC,EAAE,CAAC;IAGP,MAAM,YAAY,GAAG,YAAY;QAC/B,CAAC,CAAC,gDAAgD;QAClD,CAAC,CAAC,EAAE,CAAC;IAEP,IAAI,MAAM,EAAE,CAAC;QAEX,OAAO,GAAG,YAAY,GAAG,OAAO;;QAE5B,SAAS,CAAC,KAAK,eAAe,cAAc;;;;;;;;;iBASnC,SAAS,CAAC,KAAK;CAC/B,CAAC;IACA,CAAC;SAAM,CAAC;QAEN,OAAO,GAAG,YAAY,GAAG,OAAO;;QAE5B,SAAS,CAAC,KAAK,eAAe,cAAc;;;;;;;;;;;;;iBAanC,SAAS,CAAC,KAAK;CAC/B,CAAC;IACA,CAAC;AACH,CAAC","sourcesContent":["import { getUserFileExtension } from \"../../../../helpers/fs.helpers\";\nimport { TemplateOptions } from \"../../template-generators\";\n\nexport function generateQueryOptionsTemplate(options: TemplateOptions): string {\n  const { modelName } = options;\n  const isAuth = modelName?.camel === \"auth\";\n  const ext = getUserFileExtension();\n  const isTypeScript = ext === \"ts\";\n\n  if (!modelName)\n    throw new Error(\"Model name is required for query config template\");\n\n  // Generate imports\n  const imports = isAuth\n    ? `import { AuthPrismaQueryOptions } from 'arkos/prisma'`\n    : `import { PrismaQueryOptions } from 'arkos/prisma'`;\n\n  // Generate type annotation for TypeScript\n  const typeAnnotation = isTypeScript\n    ? isAuth\n      ? `: AuthPrismaQueryOptions<typeof prisma.${modelName.camel}>`\n      : `: PrismaQueryOptions<typeof prisma.${modelName.camel}>`\n    : \"\";\n\n  // Generate prisma import if TypeScript\n  const prismaImport = isTypeScript\n    ? `import { prisma } from \"../../utils/prisma\";\\n`\n    : \"\";\n\n  if (isAuth) {\n    // Auth template\n    return `${prismaImport}${imports};\n\nconst ${modelName.camel}QueryOptions${typeAnnotation} = {\n  getMe: {},\n  updateMe: {},\n  deleteMe: {},\n  login: {},\n  signup: {},\n  updatePassword: {},\n}\n\nexport default ${modelName.camel}QueryOptions;\n`;\n  } else {\n    // Regular template\n    return `${prismaImport}${imports};\n\nconst ${modelName.camel}QueryOptions${typeAnnotation} = {\n  // for all queries\n  queryOptions: {},\n  findOne: {},\n  findMany: {},\n  deleteMany: {},\n  updateMany: {},\n  createMany: {},\n  createOne: {},\n  updateOne: {},\n  deleteOne: {},\n}\n\nexport default ${modelName.camel}QueryOptions;\n`;\n  }\n}\n"]}
+{"version":3,"file":"generate-prisma-query-options.js","sourceRoot":"","sources":["../../../../../../../src/utils/cli/utils/template-generator/templates/generate-prisma-query-options.ts"],"names":[],"mappings":";;AAGA,oEAmEC;AAtED,+DAAsE;AAGtE,SAAgB,4BAA4B,CAAC,OAAwB;IACnE,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;IAC9B,MAAM,MAAM,GAAG,SAAS,EAAE,KAAK,KAAK,MAAM,CAAC;IAC3C,MAAM,GAAG,GAAG,IAAA,iCAAoB,GAAE,CAAC;IACnC,MAAM,YAAY,GAAG,GAAG,KAAK,IAAI,CAAC;IAElC,IAAI,CAAC,SAAS;QACZ,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;IAGtE,MAAM,OAAO,GAAG,MAAM;QACpB,CAAC,CAAC,uDAAuD;QACzD,CAAC,CAAC,mDAAmD,CAAC;IAGxD,MAAM,cAAc,GAAG,YAAY;QACjC,CAAC,CAAC,MAAM;YACN,CAAC,CAAC,0CAA0C,SAAS,CAAC,KAAK,GAAG;YAC9D,CAAC,CAAC,sCAAsC,SAAS,CAAC,KAAK,GAAG;QAC5D,CAAC,CAAC,EAAE,CAAC;IAGP,MAAM,YAAY,GAAG,YAAY;QAC/B,CAAC,CAAC,gDAAgD;QAClD,CAAC,CAAC,EAAE,CAAC;IAEP,IAAI,MAAM,EAAE,CAAC;QAEX,OAAO,GAAG,YAAY,GAAG,OAAO;;QAE5B,SAAS,CAAC,KAAK,eAAe,cAAc;;;;;;;;;iBASnC,SAAS,CAAC,KAAK;CAC/B,CAAC;IACA,CAAC;SAAM,CAAC;QAEN,OAAO,GAAG,YAAY,GAAG,OAAO;;QAE5B,SAAS,CAAC,KAAK,eAAe,cAAc;;;;;;;;;;;;;;;;;;;iBAmBnC,SAAS,CAAC,KAAK;CAC/B,CAAC;IACA,CAAC;AACH,CAAC","sourcesContent":["import { getUserFileExtension } from \"../../../../helpers/fs.helpers\";\nimport { TemplateOptions } from \"../../template-generators\";\n\nexport function generateQueryOptionsTemplate(options: TemplateOptions): string {\n  const { modelName } = options;\n  const isAuth = modelName?.camel === \"auth\";\n  const ext = getUserFileExtension();\n  const isTypeScript = ext === \"ts\";\n\n  if (!modelName)\n    throw new Error(\"Model name is required for query config template\");\n\n  // Generate imports\n  const imports = isAuth\n    ? `import { AuthPrismaQueryOptions } from 'arkos/prisma'`\n    : `import { PrismaQueryOptions } from 'arkos/prisma'`;\n\n  // Generate type annotation for TypeScript\n  const typeAnnotation = isTypeScript\n    ? isAuth\n      ? `: AuthPrismaQueryOptions<typeof prisma.${modelName.camel}>`\n      : `: PrismaQueryOptions<typeof prisma.${modelName.camel}>`\n    : \"\";\n\n  // Generate prisma import if TypeScript\n  const prismaImport = isTypeScript\n    ? `import { prisma } from \"../../utils/prisma\";\\n`\n    : \"\";\n\n  if (isAuth) {\n    // Auth template\n    return `${prismaImport}${imports};\n\nconst ${modelName.camel}QueryOptions${typeAnnotation} = {\n  getMe: {},\n  updateMe: {},\n  deleteMe: {},\n  login: {},\n  signup: {},\n  updatePassword: {},\n}\n\nexport default ${modelName.camel}QueryOptions;\n`;\n  } else {\n    // Regular template\n    return `${prismaImport}${imports};\n\nconst ${modelName.camel}QueryOptions${typeAnnotation} = {\n    global: {},\n    find: {},\n    findOne: {},\n    findMany: {},\n    udpate: {},\n    updateMany: {},\n    updateOne: {},\n    create: {},\n    createMany: {},\n    createOne: {},\n    save: {},\n    saveMany: {},\n    saveOne: {},\n    delete: {},\n    deleteMany: {},\n    deleteOne: {},\n}\n\nexport default ${modelName.camel}QueryOptions;\n`;\n  }\n}\n"]}

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

@@ -12,6 +12,8 @@ function generateRouterTemplate(options) {
         throw new Error("Model name is required for router template");
     const ext = (0, fs_helpers_1.getUserFileExtension)();
     const controllerPath = imports?.controller || `./${modelName.kebab}.controller.${ext}`;
+    const routerConfigTsType = ext === "ts" ? ": RouterConfig" : "";
+    const routerConfigTsTypeImport = ext === "ts" ? "import { RouterConfig } from 'arkos'" : "";
     const controllerExists = (0, fs_helpers_1.checkFileExists)(controllerPath);
     const controllerImportLine = controllerExists
         ? `import ${modelName.camel}Controller from "${imports?.controller || `./${modelName.kebab}.controller`}"`
@@ -22,6 +24,9 @@ function generateRouterTemplate(options) {
     return `import { Router } from 'express'
 import { authService } from 'arkos/services'
 ${controllerImportLine}
+${routerConfigTsTypeImport}
+
+export const config${routerConfigTsType} = { }
 
 const ${modelName.camel}Router = Router()
 

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

@@ -1 +1 @@
-{"version":3,"file":"generate-router-template.js","sourceRoot":"","sources":["../../../../../../../src/utils/cli/utils/template-generator/templates/generate-router-template.ts"],"names":[],"mappings":";;;;;AAOA,wDAyCC;AAhDD,0DAAkC;AAClC,+DAGwC;AAGxC,SAAgB,sBAAsB,CAAC,OAAwB;IAC7D,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAEvC,IAAI,CAAC,SAAS;QAAE,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;IAG9E,MAAM,GAAG,GAAG,IAAA,iCAAoB,GAAE,CAAC;IACnC,MAAM,cAAc,GAClB,OAAO,EAAE,UAAU,IAAI,KAAK,SAAS,CAAC,KAAK,eAAe,GAAG,EAAE,CAAC;IAElE,MAAM,gBAAgB,GAAG,IAAA,4BAAe,EAAC,cAAc,CAAC,CAAC;IAEzD,MAAM,oBAAoB,GAAG,gBAAgB;QAC3C,CAAC,CAAC,UAAU,SAAS,CAAC,KAAK,oBACvB,OAAO,EAAE,UAAU,IAAI,KAAK,SAAS,CAAC,KAAK,aAC7C,GAAG;QACL,CAAC,CAAC,aAAa,SAAS,CAAC,KAAK,oBAC1B,OAAO,EAAE,UAAU,IAAI,KAAK,SAAS,CAAC,KAAK,aAC7C,GAAG,CAAC;IAER,MAAM,qBAAqB,GAAG,gBAAgB;QAC5C,CAAC,CAAC,KAAK,SAAS,CAAC,KAAK,wBAAwB;QAC9C,CAAC,CAAC,QAAQ,SAAS,CAAC,KAAK,wBAAwB,CAAC;IAEpD,OAAO;;EAEP,oBAAoB;;QAEd,SAAS,CAAC,KAAK;;EAErB,SAAS,CAAC,KAAK;4CAC2B,IAAA,mBAAS,EACjD,SAAS,CAAC,KAAK,CAChB;;qDAEkD,SAAS,CAAC,KAAK;EAClE,qBAAqB;;;iBAGN,SAAS,CAAC,KAAK;CAC/B,CAAC;AACF,CAAC","sourcesContent":["import pluralize from \"pluralize\";\nimport {\n  checkFileExists,\n  getUserFileExtension,\n} from \"../../../../helpers/fs.helpers\";\nimport { TemplateOptions } from \"../../template-generators\";\n\nexport function generateRouterTemplate(options: TemplateOptions): string {\n  const { modelName, imports } = options;\n\n  if (!modelName) throw new Error(\"Model name is required for router template\");\n\n  // Check if controller file exists\n  const ext = getUserFileExtension();\n  const controllerPath =\n    imports?.controller || `./${modelName.kebab}.controller.${ext}`;\n\n  const controllerExists = checkFileExists(controllerPath);\n\n  const controllerImportLine = controllerExists\n    ? `import ${modelName.camel}Controller from \"${\n        imports?.controller || `./${modelName.kebab}.controller`\n      }\"`\n    : `// import ${modelName.camel}Controller from \"${\n        imports?.controller || `./${modelName.kebab}.controller`\n      }\"`;\n\n  const controllerHandlerLine = controllerExists\n    ? `  ${modelName.camel}Controller.someHandler`\n    : `  // ${modelName.camel}Controller.someHandler`;\n\n  return `import { Router } from 'express'\nimport { authService } from 'arkos/services'\n${controllerImportLine}\n\nconst ${modelName.camel}Router = Router()\n\n${modelName.camel}Router.post(\n  '/custom-endpoint', // resolves to /api/${pluralize(\n    modelName.kebab\n  )}/custom-endpoint\n  authService.authenticate,\n  authService.handleAccessControl('CustomAction', '${modelName.kebab}'),\n${controllerHandlerLine}\n)\n\nexport default ${modelName.camel}Router\n`;\n}\n"]}
+{"version":3,"file":"generate-router-template.js","sourceRoot":"","sources":["../../../../../../../src/utils/cli/utils/template-generator/templates/generate-router-template.ts"],"names":[],"mappings":";;;;;AAOA,wDAgDC;AAvDD,0DAAkC;AAClC,+DAGwC;AAGxC,SAAgB,sBAAsB,CAAC,OAAwB;IAC7D,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAEvC,IAAI,CAAC,SAAS;QAAE,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;IAG9E,MAAM,GAAG,GAAG,IAAA,iCAAoB,GAAE,CAAC;IACnC,MAAM,cAAc,GAClB,OAAO,EAAE,UAAU,IAAI,KAAK,SAAS,CAAC,KAAK,eAAe,GAAG,EAAE,CAAC;IAElE,MAAM,kBAAkB,GAAG,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC;IAChE,MAAM,wBAAwB,GAC5B,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,sCAAsC,CAAC,CAAC,CAAC,EAAE,CAAC;IAE7D,MAAM,gBAAgB,GAAG,IAAA,4BAAe,EAAC,cAAc,CAAC,CAAC;IAEzD,MAAM,oBAAoB,GAAG,gBAAgB;QAC3C,CAAC,CAAC,UAAU,SAAS,CAAC,KAAK,oBACvB,OAAO,EAAE,UAAU,IAAI,KAAK,SAAS,CAAC,KAAK,aAC7C,GAAG;QACL,CAAC,CAAC,aAAa,SAAS,CAAC,KAAK,oBAC1B,OAAO,EAAE,UAAU,IAAI,KAAK,SAAS,CAAC,KAAK,aAC7C,GAAG,CAAC;IAER,MAAM,qBAAqB,GAAG,gBAAgB;QAC5C,CAAC,CAAC,KAAK,SAAS,CAAC,KAAK,wBAAwB;QAC9C,CAAC,CAAC,QAAQ,SAAS,CAAC,KAAK,wBAAwB,CAAC;IAEpD,OAAO;;EAEP,oBAAoB;EACpB,wBAAwB;;qBAEL,kBAAkB;;QAE/B,SAAS,CAAC,KAAK;;EAErB,SAAS,CAAC,KAAK;4CAC2B,IAAA,mBAAS,EACjD,SAAS,CAAC,KAAK,CAChB;;qDAEkD,SAAS,CAAC,KAAK;EAClE,qBAAqB;;;iBAGN,SAAS,CAAC,KAAK;CAC/B,CAAC;AACF,CAAC","sourcesContent":["import pluralize from \"pluralize\";\nimport {\n  checkFileExists,\n  getUserFileExtension,\n} from \"../../../../helpers/fs.helpers\";\nimport { TemplateOptions } from \"../../template-generators\";\n\nexport function generateRouterTemplate(options: TemplateOptions): string {\n  const { modelName, imports } = options;\n\n  if (!modelName) throw new Error(\"Model name is required for router template\");\n\n  // Check if controller file exists\n  const ext = getUserFileExtension();\n  const controllerPath =\n    imports?.controller || `./${modelName.kebab}.controller.${ext}`;\n\n  const routerConfigTsType = ext === \"ts\" ? \": RouterConfig\" : \"\";\n  const routerConfigTsTypeImport =\n    ext === \"ts\" ? \"import { RouterConfig } from 'arkos'\" : \"\";\n\n  const controllerExists = checkFileExists(controllerPath);\n\n  const controllerImportLine = controllerExists\n    ? `import ${modelName.camel}Controller from \"${\n        imports?.controller || `./${modelName.kebab}.controller`\n      }\"`\n    : `// import ${modelName.camel}Controller from \"${\n        imports?.controller || `./${modelName.kebab}.controller`\n      }\"`;\n\n  const controllerHandlerLine = controllerExists\n    ? `  ${modelName.camel}Controller.someHandler`\n    : `  // ${modelName.camel}Controller.someHandler`;\n\n  return `import { Router } from 'express'\nimport { authService } from 'arkos/services'\n${controllerImportLine}\n${routerConfigTsTypeImport}\n\nexport const config${routerConfigTsType} = { }\n\nconst ${modelName.camel}Router = Router()\n\n${modelName.camel}Router.post(\n  '/custom-endpoint', // resolves to /api/${pluralize(\n    modelName.kebab\n  )}/custom-endpoint\n  authService.authenticate,\n  authService.handleAccessControl('CustomAction', '${modelName.kebab}'),\n${controllerHandlerLine}\n)\n\nexport default ${modelName.camel}Router\n`;\n}\n"]}

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

@@ -9,7 +9,7 @@ function generateServiceTemplate(options) {
     if (!modelName)
         throw new Error("Model name is required for service template");
     const prismaImport = isTypeScript
-        ? `import { prisma } from "../../utils/prisma";\n`
+        ? `import prisma from "../../utils/prisma";\n`
         : "";
     const baseServiceImport = isTypeScript
         ? `import { BaseService } from "${imports?.baseService || "arkos/services"}";`

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

@@ -1 +1 @@
-{"version":3,"file":"generate-service-template.js","sourceRoot":"","sources":["../../../../../../../src/utils/cli/utils/template-generator/templates/generate-service-template.ts"],"names":[],"mappings":";;AAGA,0DAwCC;AA3CD,+DAAsE;AAGtE,SAAgB,uBAAuB,CAAC,OAAwB;IAC9D,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IACvC,MAAM,GAAG,GAAG,IAAA,iCAAoB,GAAE,CAAC;IACnC,MAAM,YAAY,GAAG,GAAG,KAAK,IAAI,CAAC;IAElC,IAAI,CAAC,SAAS;QACZ,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;IAGjE,MAAM,YAAY,GAAG,YAAY;QAC/B,CAAC,CAAC,gDAAgD;QAClD,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,iBAAiB,GAAG,YAAY;QACpC,CAAC,CAAC,gCACE,OAAO,EAAE,WAAW,IAAI,gBAC1B,IAAI;QACN,CAAC,CAAC,gCACE,OAAO,EAAE,WAAW,IAAI,gBAC1B,IAAI,CAAC;IAGT,MAAM,aAAa,GAAG,YAAY;QAChC,CAAC,CAAC,kBAAkB,SAAS,CAAC,KAAK,GAAG;QACtC,CAAC,CAAC,EAAE,CAAC;IAEP,OAAO,GAAG,YAAY,GAAG,iBAAiB;;QAEpC,SAAS,CAAC,MAAM,8BAA8B,aAAa;;aAEtD,SAAS,CAAC,KAAK;;;;;;QAMpB,SAAS,CAAC,KAAK,iBAAiB,SAAS,CAAC,MAAM;;iBAEvC,SAAS,CAAC,KAAK;CAC/B,CAAC;AACF,CAAC","sourcesContent":["import { getUserFileExtension } from \"../../../../helpers/fs.helpers\";\nimport { TemplateOptions } from \"../../template-generators\";\n\nexport function generateServiceTemplate(options: TemplateOptions): string {\n  const { modelName, imports } = options;\n  const ext = getUserFileExtension();\n  const isTypeScript = ext === \"ts\";\n\n  if (!modelName)\n    throw new Error(\"Model name is required for service template\");\n\n  // Generate imports\n  const prismaImport = isTypeScript\n    ? `import { prisma } from \"../../utils/prisma\";\\n`\n    : \"\";\n\n  const baseServiceImport = isTypeScript\n    ? `import { BaseService } from \"${\n        imports?.baseService || \"arkos/services\"\n      }\";`\n    : `import { BaseService } from \"${\n        imports?.baseService || \"arkos/services\"\n      }\";`;\n\n  // Generate type parameter for TypeScript\n  const typeParameter = isTypeScript\n    ? `<typeof prisma.${modelName.camel}>`\n    : \"\";\n\n  return `${prismaImport}${baseServiceImport}\n  \nclass ${modelName.pascal}Service extends BaseService${typeParameter} {\n  constructor() {\n    super(\"${modelName.kebab}\");\n  }\n\n  // Add your custom service methods here\n}\n\nconst ${modelName.camel}Service = new ${modelName.pascal}Service();\n\nexport default ${modelName.camel}Service;\n`;\n}\n"]}
+{"version":3,"file":"generate-service-template.js","sourceRoot":"","sources":["../../../../../../../src/utils/cli/utils/template-generator/templates/generate-service-template.ts"],"names":[],"mappings":";;AAGA,0DAwCC;AA3CD,+DAAsE;AAGtE,SAAgB,uBAAuB,CAAC,OAAwB;IAC9D,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IACvC,MAAM,GAAG,GAAG,IAAA,iCAAoB,GAAE,CAAC;IACnC,MAAM,YAAY,GAAG,GAAG,KAAK,IAAI,CAAC;IAElC,IAAI,CAAC,SAAS;QACZ,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;IAGjE,MAAM,YAAY,GAAG,YAAY;QAC/B,CAAC,CAAC,4CAA4C;QAC9C,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,iBAAiB,GAAG,YAAY;QACpC,CAAC,CAAC,gCACE,OAAO,EAAE,WAAW,IAAI,gBAC1B,IAAI;QACN,CAAC,CAAC,gCACE,OAAO,EAAE,WAAW,IAAI,gBAC1B,IAAI,CAAC;IAGT,MAAM,aAAa,GAAG,YAAY;QAChC,CAAC,CAAC,kBAAkB,SAAS,CAAC,KAAK,GAAG;QACtC,CAAC,CAAC,EAAE,CAAC;IAEP,OAAO,GAAG,YAAY,GAAG,iBAAiB;;QAEpC,SAAS,CAAC,MAAM,8BAA8B,aAAa;;aAEtD,SAAS,CAAC,KAAK;;;;;;QAMpB,SAAS,CAAC,KAAK,iBAAiB,SAAS,CAAC,MAAM;;iBAEvC,SAAS,CAAC,KAAK;CAC/B,CAAC;AACF,CAAC","sourcesContent":["import { getUserFileExtension } from \"../../../../helpers/fs.helpers\";\nimport { TemplateOptions } from \"../../template-generators\";\n\nexport function generateServiceTemplate(options: TemplateOptions): string {\n  const { modelName, imports } = options;\n  const ext = getUserFileExtension();\n  const isTypeScript = ext === \"ts\";\n\n  if (!modelName)\n    throw new Error(\"Model name is required for service template\");\n\n  // Generate imports\n  const prismaImport = isTypeScript\n    ? `import prisma from \"../../utils/prisma\";\\n`\n    : \"\";\n\n  const baseServiceImport = isTypeScript\n    ? `import { BaseService } from \"${\n        imports?.baseService || \"arkos/services\"\n      }\";`\n    : `import { BaseService } from \"${\n        imports?.baseService || \"arkos/services\"\n      }\";`;\n\n  // Generate type parameter for TypeScript\n  const typeParameter = isTypeScript\n    ? `<typeof prisma.${modelName.camel}>`\n    : \"\";\n\n  return `${prismaImport}${baseServiceImport}\n  \nclass ${modelName.pascal}Service extends BaseService${typeParameter} {\n  constructor() {\n    super(\"${modelName.kebab}\");\n  }\n\n  // Add your custom service methods here\n}\n\nconst ${modelName.camel}Service = new ${modelName.pascal}Service();\n\nexport default ${modelName.camel}Service;\n`;\n}\n"]}

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

@@ -11,8 +11,10 @@ const prisma_helpers_1 = require("../helpers/prisma.helpers");
 class APIFeatures {
     constructor(req, modelName) {
         this.filters = {};
+        this.reqFiltersSearchParam = {};
         this.excludedFields = [
             "page",
+            "filters",
             "sort",
             "limit",
             "fields",
@@ -26,16 +28,20 @@ class APIFeatures {
             "ignoredFields",
         ];
         if (req) {
+            const { filters = "{}", ...restOfQuery } = req.query;
             this.req = req;
-            this.searchParams = (0, api_features_helpers_1.parseQueryParamsWithModifiers)(req.query);
+            this.searchParams = (0, deepmerge_helper_1.default)((0, api_features_helpers_1.parseQueryParamsWithModifiers)(restOfQuery), JSON.parse(filters));
         }
         if (modelName)
             this.modelName = modelName;
         this.filters = { ...this.filters };
     }
     setup(req, modelName) {
-        this.req = req;
-        this.searchParams = (0, api_features_helpers_1.parseQueryParamsWithModifiers)(req.query);
+        if (req) {
+            const { filters = "{}", ...restOfQuery } = req.query;
+            this.req = req;
+            this.searchParams = (0, deepmerge_helper_1.default)((0, api_features_helpers_1.parseQueryParamsWithModifiers)(restOfQuery), JSON.parse(filters));
+        }
         if (modelName)
             this.modelName = modelName;
         this.filters = { ...this.filters };

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\";\n\ntype ModelName = string;\n\nexport default class APIFeatures {\n  req?: ArkosRequest;\n  searchParams: any; // The query string parameters from the request\n  searchParamsWithModifiers: any; // The query string parameters from the request\n  filters: any = {};\n  modelName?: ModelName;\n  excludedFields = [\n    \"page\",\n    \"sort\",\n    \"limit\",\n    \"fields\",\n    \"addFields\",\n    \"removeFields\",\n    \"search\",\n    \"include\",\n    \"filterMode\",\n    \"where\",\n    \"prismaQueryOptions\",\n    \"ignoredFields\",\n  ];\n\n  constructor(req?: Request, modelName?: ModelName) {\n    if (req) {\n      this.req = req;\n      this.searchParams = parseQueryParamsWithModifiers(req.query);\n    }\n    if (modelName) this.modelName = modelName;\n    this.filters = { ...this.filters };\n  }\n\n  setup(req: Request, modelName?: ModelName) {\n    this.req = req;\n    this.searchParams = parseQueryParamsWithModifiers(req.query);\n    if (modelName) this.modelName = modelName;\n    this.filters = { ...this.filters };\n\n    return this;\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. read more about at www.arkosjs.com/docs/advanced-guide/api-features-class\"\n      );\n    const searchableFields: Record<string, any>[] = [];\n\n    const queryObj = { ...this.searchParams };\n\n    this.excludedFields.forEach((el) => delete queryObj[el]);\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 =\n      whereLogicalOperatorFilters.length > 0\n        ? {\n            [(this.req.query?.filterMode as string) ?? \"OR\"]:\n              whereLogicalOperatorFilters,\n          }\n        : {};\n\n    if (!!this.searchParams.search) {\n      const prisma = getPrismaInstance();\n\n      if (this.modelName)\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      whereOptions = deepmerge(\n        {\n          OR: searchableFields,\n        },\n        whereOptions\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    return this;\n  }\n\n  search() {\n    if (this.searchParams?.search) {\n      this.filters = deepmerge(this.filters, {\n        where: {\n          OR: [],\n        },\n      });\n    }\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    if (this.searchParams?.fields) {\n      const fields = this.searchParams.fields.split(\",\");\n\n      // Separate fields into includes, excludes, and regular fields\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      // Create selection object based on field type\n      let selection: Record<string, any> = {};\n\n      // If regular fields exist, use them as the base selection\n      if (regularFields.length > 0) {\n        selection = 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      // Otherwise, use include fields as additions to any existing included fields\n      else {\n        // Start with current include fields if they exist\n        selection = this.filters.include || {};\n\n        // Add any explicitly included fields\n        includeFields.forEach((field: string) => {\n          selection[field] = true;\n        });\n\n        // Add any explicitly excluded fields\n        excludeFields.forEach((field: string) => {\n          selection[field] = false;\n        });\n      }\n\n      // Apply the selection to filters\n      this.filters = {\n        ...this.filters,\n        select: selection,\n      };\n\n      // Remove the include filter as it's now part of select\n      if (this.filters.include) {\n        delete this.filters.include;\n      }\n    }\n\n    // Remove any references to the now-unused parameters\n    if (this.searchParams?.addFields || this.searchParams?.removeFields) {\n      throw new AppError(\n        \"The addFields and removeFields parameters are deprecated. Please use fields with + and - prefixes instead.\",\n        400\n      );\n    }\n\n    return this;\n  }\n\n  paginate() {\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    this.filters = {\n      ...this.filters,\n      skip,\n      take: limit,\n    };\n    return this;\n  }\n}\n\nexport const apiFeatures = new APIFeatures();\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\";\n\ntype ModelName = string;\n\nexport default class APIFeatures {\n  req?: ArkosRequest;\n  searchParams: any; // The query string parameters from the request\n  searchParamsWithModifiers: any; // The query string parameters from the request\n  filters: 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  ];\n\n  constructor(req?: Request, modelName?: ModelName) {\n    if (req) {\n      const { filters = \"{}\", ...restOfQuery } = req.query;\n      this.req = req;\n      this.searchParams = deepmerge(\n        parseQueryParamsWithModifiers(restOfQuery),\n        JSON.parse(filters as string)\n      );\n    }\n    if (modelName) this.modelName = modelName;\n    this.filters = { ...this.filters };\n  }\n\n  setup(req: Request, modelName?: ModelName) {\n    if (req) {\n      const { filters = \"{}\", ...restOfQuery } = req.query;\n      this.req = req;\n      this.searchParams = deepmerge(\n        parseQueryParamsWithModifiers(restOfQuery),\n        JSON.parse(filters as string)\n      );\n    }\n    if (modelName) this.modelName = modelName;\n    this.filters = { ...this.filters };\n\n    return this;\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. read more about at www.arkosjs.com/docs/advanced-guide/api-features-class\"\n      );\n    const searchableFields: Record<string, any>[] = [];\n\n    const queryObj = { ...this.searchParams };\n\n    this.excludedFields.forEach((el) => delete queryObj[el]);\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 =\n      whereLogicalOperatorFilters.length > 0\n        ? {\n            [(this.req.query?.filterMode as string) ?? \"OR\"]:\n              whereLogicalOperatorFilters,\n          }\n        : {};\n\n    if (!!this.searchParams.search) {\n      const prisma = getPrismaInstance();\n\n      if (this.modelName)\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      whereOptions = deepmerge(\n        {\n          OR: searchableFields,\n        },\n        whereOptions\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    return this;\n  }\n\n  search() {\n    if (this.searchParams?.search) {\n      this.filters = deepmerge(this.filters, {\n        where: {\n          OR: [],\n        },\n      });\n    }\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    if (this.searchParams?.fields) {\n      const fields = this.searchParams.fields.split(\",\");\n\n      // Separate fields into includes, excludes, and regular fields\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      // Create selection object based on field type\n      let selection: Record<string, any> = {};\n\n      // If regular fields exist, use them as the base selection\n      if (regularFields.length > 0) {\n        selection = 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      // Otherwise, use include fields as additions to any existing included fields\n      else {\n        // Start with current include fields if they exist\n        selection = this.filters.include || {};\n\n        // Add any explicitly included fields\n        includeFields.forEach((field: string) => {\n          selection[field] = true;\n        });\n\n        // Add any explicitly excluded fields\n        excludeFields.forEach((field: string) => {\n          selection[field] = false;\n        });\n      }\n\n      // Apply the selection to filters\n      this.filters = {\n        ...this.filters,\n        select: selection,\n      };\n\n      // Remove the include filter as it's now part of select\n      if (this.filters.include) {\n        delete this.filters.include;\n      }\n    }\n\n    // Remove any references to the now-unused parameters\n    if (this.searchParams?.addFields || this.searchParams?.removeFields) {\n      throw new AppError(\n        \"The addFields and removeFields parameters are deprecated. Please use fields with + and - prefixes instead.\",\n        400\n      );\n    }\n\n    return this;\n  }\n\n  paginate() {\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    this.filters = {\n      ...this.filters,\n      skip,\n      take: limit,\n    };\n    return this;\n  }\n}\n\nexport const apiFeatures = new APIFeatures();\n"]}

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

@@ -20,7 +20,8 @@ function fullCleanCwd(path) {
     if (typeof path !== "string")
         throw new Error("Path must be a string");
     const cwd = process.cwd().replace(/\/+$/, "");
-    return path.replace(new RegExp(`${cwd}/?`, "g"), "");
+    const escapedCwd = cwd.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+    return path.replace(new RegExp(`${escapedCwd}/?`, "g"), "");
 }
 const getUserFileExtension = () => {
     if (exports.userFileExtension)
@@ -28,13 +29,19 @@ const getUserFileExtension = () => {
     try {
         const currentDir = process.cwd();
         const hasTsConfig = fs_1.default.existsSync(path_1.default.join(currentDir, "tsconfig.json"));
+        const hasAppTs = fs_1.default.existsSync(path_1.default.join(currentDir, "src", "app.ts"));
+        const hasAppJs = fs_1.default.existsSync(path_1.default.join(currentDir, "src", "app.js"));
         const isBuildMode = process.env.ARKOS_BUILD === "true";
-        if (hasTsConfig && !isBuildMode) {
+        if (isBuildMode)
+            exports.userFileExtension = "js";
+        else if (hasTsConfig)
+            exports.userFileExtension = "ts";
+        else if (hasAppTs && !hasAppJs)
             exports.userFileExtension = "ts";
-        }
-        else {
+        else if (hasAppJs)
+            exports.userFileExtension = "js";
+        else
             exports.userFileExtension = "js";
-        }
         return exports.userFileExtension;
     }
     catch (e) {

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":";;;;;;AAoBA,oCAKC;AAkDD,0CAMC;AAjFD,+BAAiC;AACjC,4CAAoB;AACpB,gDAAwB;AAEX,QAAA,SAAS,GAAG,IAAA,gBAAS,EAAC,YAAE,CAAC,IAAI,CAAC,CAAC;AAC/B,QAAA,WAAW,GAAG,IAAA,gBAAS,EAAC,YAAE,CAAC,MAAM,CAAC,CAAC;AACnC,QAAA,UAAU,GAAG,IAAA,gBAAS,EAAC,YAAE,CAAC,KAAK,CAAC,CAAC;AAEvC,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;AASpB,SAAgB,YAAY,CAAC,IAAY;IACvC,IAAI,OAAO,IAAI,KAAK,QAAQ;QAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;IAEvE,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IAC9C,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,GAAG,GAAG,IAAI,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;AACvD,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;QAGjC,MAAM,WAAW,GAAG,YAAE,CAAC,UAAU,CAAC,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC,CAAC;QAG1E,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,KAAK,MAAM,CAAC;QAGvD,IAAI,WAAW,IAAI,CAAC,WAAW,EAAE,CAAC;YAChC,yBAAiB,GAAG,IAAI,CAAC;QAC3B,CAAC;aAAM,CAAC;YACN,yBAAiB,GAAG,IAAI,CAAC;QAC3B,CAAC;QAED,OAAO,yBAAiB,CAAC;IAC3B,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QAEX,yBAAiB,GAAG,IAAI,CAAC;QACzB,OAAO,yBAAiB,CAAC;IAC3B,CAAC;AACH,CAAC,CAAC;AAzBW,QAAA,oBAAoB,wBAyB/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 { promisify } from \"util\";\nimport fs from \"fs\";\nimport path from \"path\";\n\nexport const statAsync = promisify(fs.stat);\nexport const accessAsync = promisify(fs.access);\nexport const mkdirAsync = promisify(fs.mkdir);\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 *\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  const cwd = process.cwd().replace(/\\/+$/, \"\"); // remove trailing slashes\n  return path.replace(new RegExp(`${cwd}/?`, \"g\"), \"\"); // remove cwd + optional slash\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    // Check for tsconfig.json in current directory\n    const hasTsConfig = fs.existsSync(path.join(currentDir, \"tsconfig.json\"));\n\n    // Check environment variable for build mode\n    const isBuildMode = process.env.ARKOS_BUILD === \"true\";\n\n    // If tsconfig exists and not in build mode, use TypeScript\n    if (hasTsConfig && !isBuildMode) {\n      userFileExtension = \"ts\";\n    } else {\n      userFileExtension = \"js\";\n    }\n\n    return userFileExtension;\n  } catch (e) {\n    // Default to js if anything goes wrong\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.log('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":";;;;;;AAmBA,oCAOC;AAsDD,0CAMC;AAtFD,+BAAiC;AACjC,4CAAoB;AACpB,gDAAwB;AAEX,QAAA,SAAS,GAAG,IAAA,gBAAS,EAAC,YAAE,CAAC,IAAI,CAAC,CAAC;AAC/B,QAAA,WAAW,GAAG,IAAA,gBAAS,EAAC,YAAE,CAAC,MAAM,CAAC,CAAC;AACnC,QAAA,UAAU,GAAG,IAAA,gBAAS,EAAC,YAAE,CAAC,KAAK,CAAC,CAAC;AAEvC,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,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IAC9C,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,qBAAqB,EAAE,MAAM,CAAC,CAAC;IAE9D,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,GAAG,UAAU,IAAI,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;AAC9D,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;QAGjC,MAAM,WAAW,GAAG,YAAE,CAAC,UAAU,CAAC,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC,CAAC;QAG1E,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;QAGvE,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,KAAK,MAAM,CAAC;QAGvD,IAAI,WAAW;YAAE,yBAAiB,GAAG,IAAI,CAAC;aACrC,IAAI,WAAW;YAAE,yBAAiB,GAAG,IAAI,CAAC;aAC1C,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;QAEX,yBAAiB,GAAG,IAAI,CAAC;QACzB,OAAO,yBAAiB,CAAC;IAC3B,CAAC;AACH,CAAC,CAAC;AA7BW,QAAA,oBAAoB,wBA6B/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 { promisify } from \"util\";\nimport fs from \"fs\";\nimport path from \"path\";\n\nexport const statAsync = promisify(fs.stat);\nexport const accessAsync = promisify(fs.access);\nexport const mkdirAsync = promisify(fs.mkdir);\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  const cwd = process.cwd().replace(/\\/+$/, \"\"); // remove trailing slashes\n  const escapedCwd = cwd.replace(/[.*+?^${}()|[\\]\\\\]/g, \"\\\\$&\"); // escape regex special chars\n\n  return path.replace(new RegExp(`${escapedCwd}/?`, \"g\"), \"\"); // remove cwd + optional slash\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    // Check for tsconfig.json in current directory\n    const hasTsConfig = fs.existsSync(path.join(currentDir, \"tsconfig.json\"));\n\n    // Check for main app files\n    const hasAppTs = fs.existsSync(path.join(currentDir, \"src\", \"app.ts\"));\n    const hasAppJs = fs.existsSync(path.join(currentDir, \"src\", \"app.js\"));\n\n    // Check environment variable for build mode\n    const isBuildMode = process.env.ARKOS_BUILD === \"true\";\n\n    // Decision logic (prioritized)\n    if (isBuildMode) userFileExtension = \"js\";\n    else if (hasTsConfig) 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    // Default to js if anything goes wrong\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/cjs/utils/helpers/global.helpers.js

@@ -32,9 +32,58 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getPackageJson = getPackageJson;
+exports.isEsm = isEsm;
 exports.importModule = importModule;
-async function importModule(path) {
-    return await Promise.resolve(`${path}`).then(s => __importStar(require(s)));
+exports.detectPackageManagerFromUserAgent = detectPackageManagerFromUserAgent;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const module_1 = require("module");
+const url_1 = require("url");
+function getPackageJson() {
+    try {
+        const pkgPath = path_1.default.join(process.cwd(), "package.json");
+        if (fs_1.default.existsSync(pkgPath)) {
+            return JSON.parse(fs_1.default.readFileSync(pkgPath, "utf8"));
+        }
+    }
+    catch (err) {
+        console.error("Error checking package.json:", err);
+    }
+}
+function isEsm() {
+    const pkg = getPackageJson();
+    return pkg?.type === "module";
+}
+async function importModule(modulePath, options = { fixExtension: true }) {
+    if (!options.fixExtension || modulePath.endsWith(".ts") || !isEsm())
+        return await Promise.resolve(`${modulePath}`).then(s => __importStar(require(s)));
+    const userRequire = (0, module_1.createRequire)((0, url_1.pathToFileURL)(process.cwd() + "/package.json"));
+    const resolved = userRequire.resolve(modulePath);
+    return await Promise.resolve(`${(0, url_1.pathToFileURL)(resolved)}`).then(s => __importStar(require(s)));
+}
+function detectPackageManagerFromUserAgent() {
+    const userAgent = process.env.npm_config_user_agent || "";
+    if (!userAgent)
+        return "npm";
+    if (userAgent.includes("cnpm"))
+        return "cnpm";
+    if (userAgent.includes("pnpm"))
+        return "pnpm";
+    if (userAgent.includes("yarn"))
+        return "yarn";
+    if (userAgent.includes("npm"))
+        return "npm";
+    if (userAgent.includes("bun"))
+        return "bun";
+    if (userAgent.includes("corepack"))
+        return "corepack";
+    if (userAgent.includes("deno"))
+        return "deno";
+    return "npm";
 }
 //# sourceMappingURL=global.helpers.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"global.helpers.js","sourceRoot":"","sources":["../../../../src/utils/helpers/global.helpers.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oCAEC;AAFM,KAAK,UAAU,YAAY,CAAC,IAAY;IAC7C,OAAO,yBAAa,IAAI,uCAAC,CAAC;AAC5B,CAAC","sourcesContent":["export async function importModule(path: string) {\n  return await import(path);\n}\n"]}
+{"version":3,"file":"global.helpers.js","sourceRoot":"","sources":["../../../../src/utils/helpers/global.helpers.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAMA,wCASC;AAED,sBAGC;AAED,oCAaC;AAQD,8EAaC;AAxDD,4CAAoB;AACpB,gDAAwB;AACxB,mCAAuC;AACvC,6BAAoC;AAGpC,SAAgB,cAAc;IAC5B,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,cAAc,CAAC,CAAC;QACzD,IAAI,YAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;YAC3B,OAAO,IAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;QACtD,CAAC;IACH,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,CAAC,KAAK,CAAC,8BAA8B,EAAE,GAAG,CAAC,CAAC;IACrD,CAAC;AACH,CAAC;AAED,SAAgB,KAAK;IACnB,MAAM,GAAG,GAAG,cAAc,EAAE,CAAC;IAC7B,OAAO,GAAG,EAAE,IAAI,KAAK,QAAQ,CAAC;AAChC,CAAC;AAEM,KAAK,UAAU,YAAY,CAChC,UAAkB,EAClB,UAAqC,EAAE,YAAY,EAAE,IAAI,EAAE;IAE3D,IAAI,CAAC,OAAO,CAAC,YAAY,IAAI,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE;QACjE,OAAO,yBAAa,UAAU,uCAAC,CAAC;IAGlC,MAAM,WAAW,GAAG,IAAA,sBAAa,EAC/B,IAAA,mBAAa,EAAC,OAAO,CAAC,GAAG,EAAE,GAAG,eAAe,CAAC,CAC/C,CAAC;IACF,MAAM,QAAQ,GAAG,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IACjD,OAAO,yBAAa,IAAA,mBAAa,EAAC,QAAQ,CAAQ,uCAAC,CAAC;AACtD,CAAC;AAQD,SAAgB,iCAAiC;IAC/C,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB,IAAI,EAAE,CAAC;IAE1D,IAAI,CAAC,SAAS;QAAE,OAAO,KAAK,CAAC;IAC7B,IAAI,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC;QAAE,OAAO,MAAM,CAAC;IAC9C,IAAI,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC;QAAE,OAAO,MAAM,CAAC;IAC9C,IAAI,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC;QAAE,OAAO,MAAM,CAAC;IAC9C,IAAI,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IAC5C,IAAI,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IAC5C,IAAI,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC;QAAE,OAAO,UAAU,CAAC;IACtD,IAAI,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC;QAAE,OAAO,MAAM,CAAC;IAE9C,OAAO,KAAK,CAAC;AACf,CAAC","sourcesContent":["import fs from \"fs\";\nimport path from \"path\";\nimport { createRequire } from \"module\";\nimport { pathToFileURL } from \"url\";\nimport { getUserFileExtension } from \"./fs.helpers\";\n\nexport function getPackageJson() {\n  try {\n    const pkgPath = path.join(process.cwd(), \"package.json\");\n    if (fs.existsSync(pkgPath)) {\n      return JSON.parse(fs.readFileSync(pkgPath, \"utf8\"));\n    }\n  } catch (err) {\n    console.error(\"Error checking package.json:\", err);\n  }\n}\n\nexport function isEsm() {\n  const pkg = getPackageJson();\n  return pkg?.type === \"module\";\n}\n\nexport async function importModule(\n  modulePath: string,\n  options: { fixExtension: boolean } = { fixExtension: true }\n) {\n  if (!options.fixExtension || modulePath.endsWith(\".ts\") || !isEsm())\n    return await import(modulePath);\n\n  // When importing user modules: mainly on ESM environment\n  const userRequire = createRequire(\n    pathToFileURL(process.cwd() + \"/package.json\")\n  );\n  const resolved = userRequire.resolve(modulePath);\n  return await import(pathToFileURL(resolved) as any);\n}\n\n/**\n * Helps getting the current package manager from user agent\n *\n * @returns {string} the package manager\n * @default \"npm\"\n */\nexport function detectPackageManagerFromUserAgent(): string {\n  const userAgent = process.env.npm_config_user_agent || \"\";\n\n  if (!userAgent) return \"npm\";\n  if (userAgent.includes(\"cnpm\")) return \"cnpm\";\n  if (userAgent.includes(\"pnpm\")) return \"pnpm\";\n  if (userAgent.includes(\"yarn\")) return \"yarn\";\n  if (userAgent.includes(\"npm\")) return \"npm\";\n  if (userAgent.includes(\"bun\")) return \"bun\";\n  if (userAgent.includes(\"corepack\")) return \"corepack\";\n  if (userAgent.includes(\"deno\")) return \"deno\";\n\n  return \"npm\";\n}\n"]}

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

@@ -1,42 +1,10 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.prismaModelsUniqueFields = exports.models = exports.prismaModelRelationFields = exports.prismaModelsModules = void 0;
+exports.prismaModelsUniqueFields = exports.prismaSchemasContent = exports.models = exports.prismaModelRelationFields = void 0;
+exports.setModelModules = setModelModules;
 exports.getModelModules = getModelModules;
 exports.getFileModelModulesFileStructure = getFileModelModulesFileStructure;
 exports.processSubdir = processSubdir;
@@ -46,6 +14,7 @@ exports.importPrismaModelModules = importPrismaModelModules;
 exports.getAllPrismaFiles = getAllPrismaFiles;
 exports.initializePrismaModels = initializePrismaModels;
 exports.getPrismaModelRelations = getPrismaModelRelations;
+exports.getPrismaSchemasContent = getPrismaSchemasContent;
 exports.getModels = getModels;
 exports.getModelUniqueFields = getModelUniqueFields;
 const path_1 = __importDefault(require("path"));
@@ -54,9 +23,12 @@ const change_case_helpers_1 = require("../../utils/helpers/change-case.helpers")
 const fs_helpers_1 = require("./fs.helpers");
 const global_helpers_1 = require("./global.helpers");
 const cli_helpers_1 = require("../cli/utils/cli.helpers");
-exports.prismaModelsModules = {};
+let prismaModelsModules = {};
+function setModelModules(modelName, modules) {
+    prismaModelsModules[(0, change_case_helpers_1.kebabCase)(modelName)] = modules;
+}
 function getModelModules(modelName) {
-    return exports.prismaModelsModules[(0, change_case_helpers_1.kebabCase)(modelName)];
+    return prismaModelsModules[(0, change_case_helpers_1.kebabCase)(modelName)];
 }
 function getFileModelModulesFileStructure(modelName) {
     const kebabModelName = (0, change_case_helpers_1.kebabCase)(modelName).toLowerCase();
@@ -86,6 +58,8 @@ function getFileModelModulesFileStructure(modelName) {
                 createMany: `create-many-${kebabModelName}.dto.${ext}`,
                 update: `update-${kebabModelName}.dto.${ext}`,
                 updateMany: `update-many-${kebabModelName}.dto.${ext}`,
+                findOne: `find-one-${kebabModelName}.dto.${ext}`,
+                findMany: `find-many-${kebabModelName}.dto.${ext}`,
                 query: `query-${kebabModelName}.dto.${ext}`,
             },
         schemas: isAuthModule
@@ -101,14 +75,17 @@ function getFileModelModulesFileStructure(modelName) {
                 createMany: `create-many-${kebabModelName}.schema.${ext}`,
                 update: `update-${kebabModelName}.schema.${ext}`,
                 updateMany: `update-many-${kebabModelName}.schema.${ext}`,
+                findOne: `find-one-${kebabModelName}.schema.${ext}`,
+                findMany: `find-many-${kebabModelName}.schema.${ext}`,
                 query: `query-${kebabModelName}.schema.${ext}`,
             },
     };
 }
-async function processSubdir(modelName, type, result) {
+async function processSubdir(modelName, type) {
     const moduleDir = path_1.default.resolve((0, fs_helpers_1.crd)(), "src", "modules", (0, change_case_helpers_1.kebabCase)(modelName));
     const subdir = path_1.default.join(moduleDir, type);
     const fileStructure = getFileModelModulesFileStructure(modelName);
+    const result = {};
     try {
         await fs_1.default.promises.access(subdir).catch(() => {
             return;
@@ -116,9 +93,9 @@ async function processSubdir(modelName, type, result) {
         await Promise.all(Object.entries(fileStructure[type]).map(async ([key, fileName]) => {
             const filePath = path_1.default.join(subdir, fileName);
             try {
-                const module = await Promise.resolve(`${filePath}`).then(s => __importStar(require(s))).catch(() => null);
+                const module = await (0, global_helpers_1.importModule)(filePath).catch(() => null);
                 if (module)
-                    result[type][key] = module.default;
+                    result[key] = module.default;
             }
             catch (error) {
                 console.error(error);
@@ -128,6 +105,7 @@ async function processSubdir(modelName, type, result) {
     catch (error) {
         console.error(error);
     }
+    return result;
 }
 function validateNamingConventions(key, fileName, result) {
     if (key === "prismaQueryOptions") {
@@ -169,7 +147,7 @@ function assignModuleToResult(key, module, result) {
         result[key] = module.default || module;
     }
 }
-async function importPrismaModelModules(modelName) {
+async function importPrismaModelModules(modelName, arkosConfig) {
     const moduleDir = path_1.default.resolve((0, fs_helpers_1.crd)(), "src", "modules", (0, change_case_helpers_1.kebabCase)(modelName));
     const result = {
         dtos: {},
@@ -201,12 +179,22 @@ async function importPrismaModelModules(modelName) {
             (0, cli_helpers_1.killServerChildProcess)();
         }
     }));
-    await Promise.all([
-        processSubdir(modelName, "dtos", result),
-        processSubdir(modelName, "schemas", result),
-    ]);
-    exports.prismaModelsModules[modelName] = result;
-    return result;
+    const validationSubdir = arkosConfig.validation?.resolver
+        ? arkosConfig.validation.resolver === "zod"
+            ? "schemas"
+            : "dtos"
+        : null;
+    let validators = {};
+    if (validationSubdir)
+        validators = await processSubdir(modelName, validationSubdir);
+    prismaModelsModules[modelName] = {
+        ...result,
+        ...(validationSubdir && { [validationSubdir]: validators }),
+    };
+    return {
+        ...result,
+        ...(validationSubdir && { [validationSubdir]: validators }),
+    };
 }
 exports.prismaModelRelationFields = {};
 function getAllPrismaFiles(dirPath, fileList = []) {
@@ -241,11 +229,13 @@ function initializePrismaModels() {
             exports.models.push((0, change_case_helpers_1.camelCase)(modelName.trim()));
         return `model ${modelName} {`;
     });
+    const copiedContent = content;
+    exports.prismaSchemasContent = content;
     for (const model of exports.models) {
         const modelName = (0, change_case_helpers_1.pascalCase)(model);
-        const modelStart = content.indexOf(`model ${modelName} {`);
-        const modelEnd = content.indexOf("}", modelStart);
-        const modelDefinition = content.slice(modelStart, modelEnd);
+        const modelStart = copiedContent.indexOf(`model ${modelName} {`);
+        const modelEnd = copiedContent.indexOf("}", modelStart);
+        const modelDefinition = copiedContent.slice(modelStart, modelEnd);
         const relations = {
             singular: [],
             list: [],
@@ -276,8 +266,8 @@ function initializePrismaModels() {
             if (trimmedLine?.includes?.("@relation") ||
                 trimmedLine.match(/\s+\w+(\[\])?(\s+@|$)/) ||
                 exports.models?.includes?.((0, change_case_helpers_1.camelCase)(cleanType || ""))) {
-                const enumStart = content.indexOf(`enum ${cleanType} {`);
-                const typeStart = content.indexOf(`type ${cleanType} {`);
+                const enumStart = copiedContent.indexOf(`enum ${cleanType} {`);
+                const typeStart = copiedContent.indexOf(`type ${cleanType} {`);
                 if (!cleanType ||
                     enumStart >= 0 ||
                     typeStart >= 0 ||
@@ -309,7 +299,6 @@ function initializePrismaModels() {
         }
     }
 }
-initializePrismaModels();
 function getPrismaModelRelations(modelName) {
     modelName = (0, change_case_helpers_1.pascalCase)(modelName);
     if (!(modelName in exports.prismaModelRelationFields))
@@ -319,6 +308,9 @@ function getPrismaModelRelations(modelName) {
 function getModels() {
     return exports.models;
 }
+function getPrismaSchemasContent() {
+    return exports.prismaSchemasContent;
+}
 function getModelUniqueFields(modelName) {
     return exports.prismaModelsUniqueFields[modelName];
 }