create-arkos 1.3.1-beta → 1.3.2-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-arkos",
-  "version": "1.3.1-beta",
+  "version": "1.3.2-beta.1",
   "type": "module",
   "description": "CLI for creating Arkos.js projects, see docs at www.arkosjs.com",
   "bin": {

package/templates/basic/README.md.hbs

@@ -1,4 +1,4 @@
-This is a [Arkos.js](https://arkosjs.com) project bootstrapped with [`create-arkos`](https://arkosjs.com/docs/cli/create-arkos).
+This is a [Arkos.js](https://arkosjs.com) project scaffolded with [`create-arkos`](https://arkosjs.com/docs/cli/create-arkos).
 
 ## Getting Started
 

package/templates/basic/package.json.hbs

@@ -5,7 +5,7 @@
   {{else}}
   "type": "module",
   {{/if}}
-  "description": "This RESTful API was generated by Arkos.js, read more about Arkos.js at www.arkosjs.com",
+  "description": "This RESTful API was generated by create-arkos, read more about Arkos.js at www.arkosjs.com",
   "scripts": {
     "dev": "arkos dev",
     "build": "arkos build",
@@ -27,7 +27,7 @@
     "prisma": "^6.11.1"
   },
   "dependencies": {
-    "arkos": "^1.3.1-beta", 
+    "arkos": "^1.3.2-beta", 
     "express": "^4.21.2",
     "@prisma/client": "^6.4.1",
     "swagger-jsdoc": "^6.2.8"{{#if validation.type}},{{/if}}

package/templates/basic/src/app.ts.hbs

@@ -12,11 +12,13 @@ arkos.init({
     }
   },
   {{/if}}
-  {{#if routing.strict}}
   routers: {
-    strict: true,
-  },
+  {{#if routing.strict}}
+    strict: true
+  {{else}}
+    strict: "no-bulk"
   {{/if}}
+  },
   {{#if validation.type}}
   validation: {
     resolver: '{{validation.type}}'

package/templates/basic/src/modules/auth/auth.middlewares.ts.hbs

@@ -1,103 +1,123 @@
 {{#if typescript}}
 import { ArkosRequest, ArkosResponse, ArkosNextFunction } from "arkos";
 
-// export const beforeGetMe = async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
-//   // Your logic here
-//   next();
-// };
-// 
-// export const afterGetMe = async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
-//   // Your logic here
-//   next();
-// };
-// 
-// export const beforeLogin = async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
-//   // Your logic here
-//   next();
-// };
-// 
-// export const afterLogin = async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
-//   // Your logic here
-//   next();
-// };
-// 
-// export const beforeLogout = async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
-//   // Your logic here
-//   next();
-// };
-// 
-// export const afterLogout = async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
-//   // Your logic here
-//   next();
-// };
-// 
-// export const beforeSignup = async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
-//   // Your logic here
-//   next();
-// };
-// 
-// export const afterSignup = async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
-//   // Your logic here
-//   next();
-// };
-// 
-// export const beforeUpdatePassword = async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
-//   // Your logic here
-//   next();
-// };
-// 
-// export const afterUpdatePassword = async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
-//   // Your logic here
-//   next();
-// };
+// export const beforeGetMe = [async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
+//   next();
+// }];
+
+// export const afterGetMe = [async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
+//   next();
+// }];
+
+// export const onGetMeError = [async (err: any, req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
+//   next();
+// }];
+
+// export const beforeLogin = [async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
+//   next();
+// }];
+
+// export const afterLogin = [async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
+//   next();
+// }];
+
+// export const onLoginError = [async (err: any, req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
+//   next();
+// }];
+
+// export const beforeLogout = [async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
+//   next();
+// }];
+
+// export const afterLogout = [async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
+//   next();
+// }];
+
+// export const onLogoutError = [async (err: any, req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
+//   next();
+// }];
+
+// export const beforeSignup = [async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
+//   next();
+// }];
+
+// export const afterSignup = [async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
+//   next();
+// }];
+
+// export const onSignupError = [async (err: any, req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
+//   next();
+// }];
+
+// export const beforeUpdatePassword = [async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
+//   next();
+// }];
+
+// export const afterUpdatePassword = [async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
+//   next();
+// }];
+
+// export const onUpdatePasswordError = [async (err: any, req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
+//   next();
+// }];
 {{else}}
-// export const beforeGetMe = async (req, res, next) => {
-//   // Your logic here
-//   next();
-// };
-// 
-// export const afterGetMe = async (req, res, next) => {
-//   // Your logic here
-//   next();
-// };
-// 
-// export const beforeLogin = async (req, res, next) => {
-//   // Your logic here
-//   next();
-// };
-// 
-// export const afterLogin = async (req, res, next) => {
-//   // Your logic here
-//   next();
-// };
-// 
-// export const beforeLogout = async (req, res, next) => {
-//   // Your logic here
-//   next();
-// };
-// 
-// export const afterLogout = async (req, res, next) => {
-//   // Your logic here
-//   next();
-// };
-// 
-// export const beforeSignup = async (req, res, next) => {
-//   // Your logic here
-//   next();
-// };
-// 
-// export const afterSignup = async (req, res, next) => {
-//   // Your logic here
-//   next();
-// };
-// 
-// export const beforeUpdatePassword = async (req, res, next) => {
-//   // Your logic here
-//   next();
-// };
-// 
-// export const afterUpdatePassword = async (req, res, next) => {
-//   // Your logic here
-//   next();
-// };
-// {{/if}}
+// export const beforeGetMe = [async (req, res, next) => {
+//   next();
+// }];
+
+// export const afterGetMe = [async (req, res, next) => {
+//   next();
+// }];
+
+// export const onGetMeError = [async (err, req, res, next) => {
+//   next();
+// }];
+
+// export const beforeLogin = [async (req, res, next) => {
+//   next();
+// }];
+
+// export const afterLogin = [async (req, res, next) => {
+//   next();
+// }];
+
+// export const onLoginError = [async (err, req, res, next) => {
+//   next();
+// }];
+
+// export const beforeLogout = [async (req, res, next) => {
+//   next();
+// }];
+
+// export const afterLogout = [async (req, res, next) => {
+//   next();
+// }];
+
+// export const onLogoutError = [async (err, req, res, next) => {
+//   next();
+// }];
+
+// export const beforeSignup = [async (req, res, next) => {
+//   next();
+// }];
+
+// export const afterSignup = [async (req, res, next) => {
+//   next();
+// }];
+
+// export const onSignupError = [async (err, req, res, next) => {
+//   next();
+// }];
+
+// export const beforeUpdatePassword = [async (req, res, next) => {
+//   next();
+// }];
+
+// export const afterUpdatePassword = [async (req, res, next) => {
+//   next();
+// }];
+
+// export const onUpdatePasswordError = [async (err, req, res, next) => {
+//   next();
+// }];
+{{/if}}

package/templates/basic/src/modules/auth/auth.query.ts.hbs

@@ -1,11 +1,11 @@
 {{#if typescript}}
-import prisma from "../../utils/prisma/index.js";
+import { Prisma } from "@prisma/client"
 import { AuthPrismaQueryOptions } from 'arkos/prisma';
 
-const authQueryOptions: AuthPrismaQueryOptions<typeof prisma.user> = {
+const authQueryOptions: AuthPrismaQueryOptions<Prisma.UserDelegate> = {
 {{else}}
 /**
- * @type {import("arkos/prisma").PrismaQueryOptions<typeof import('../../utils/prisma/index.js').prisma.user>}
+ * @type {import("arkos/prisma").PrismaQueryOptions<typeof import("@prisma/client").Prisma.UserDelegate>}
  */
 const authQueryOptions = {
 {{/if}}

package/templates/basic/src/modules/auth-permission/auth-permission.auth.ts.hbs

@@ -1,6 +1,16 @@
 {{#if typescript}}
-import { AuthConfigs } from "arkos/auth"
+import { AuthConfigs } from "arkos/auth";
+{{/if}}
+import { authService } from "arkos/services";
+
+export const authPermissionPermissions = {
+  canCreate: authService.permission("Create", "auth-permission"),
+  canUpdate: authService.permission("Update", "auth-permission"),
+  canDelete: authService.permission("Delete", "auth-permission"),
+  canView: authService.permission("View", "auth-permission"),
+}
 
+{{#if typescript}}
 const authPermissionAuthConfigs: AuthConfigs = {
 {{else}}
 /** @type {import('arkos/auth').AuthConfigs} */
@@ -14,10 +24,34 @@ const authPermissionAuthConfigs = {
   },
   {{#if (eq authentication.type "static")}}
   accessControl: {
-    // Create: ["Admin"],
-    // Update: ["Admin", "Manager"],
-    // Delete: ["Admin"],
-    // View: ["User", "Admin", "Guest"],
+    // Create: {
+    {{#if (eq authentication.type "static")}}
+    //   roles: [],
+    {{/if}}
+    //   name: "Create New Auth Permission",
+    //   description: "Permission to create auth permission records"
+    // },
+    // Update: {
+    {{#if (eq authentication.type "static")}}
+    //   roles: [],
+    {{/if}}
+    //   name: "Update Auth Permission",
+    //   description: "Permission to update auth permission records"
+    // },
+    // Delete: {
+    {{#if (eq authen.type "static")}}
+    //   roles: [],
+    {{/if}}
+    //   name: "Delete Auth Permission",
+    //   description: "Permission to delete auth permission records"
+    // },
+    // View: {
+    {{#if (eq authen.type "static")}}
+    //   roles: [],
+    {{/if}}
+    //   name: "View Auth Permission",
+    //   description: "Permission to update auth permission records"
+    // },
   },
   {{/if}}
 };

package/templates/basic/src/modules/auth-permission/auth-permission.query.ts.hbs

@@ -1,11 +1,11 @@
 {{#if typescript}}
-import prisma from "../../utils/prisma/index.js";
+import { Prisma } from "@prisma/client"
 import { PrismaQueryOptions } from 'arkos/prisma';
 
-const authPermissionQueryOptions: PrismaQueryOptions<typeof prisma.authPermission> = {
+const authPermissionQueryOptions: PrismaQueryOptions<Prisma.AuthPermissionDelegate> = {
 {{else}}
 /**
- * @type {import("arkos/prisma").PrismaQueryOptions<typeof import('../../utils/prisma/index.js').prisma.authPermission>}
+ * @type {import("arkos/prisma").PrismaQueryOptions<typeof import("@prisma/client").Prisma.AuthPermissionDelegate>}
  */
 const authPermissionQueryOptions = {
 {{/if}}

package/templates/basic/src/modules/auth-permission/auth-permission.service.ts.hbs

@@ -1,12 +1,13 @@
 import { BaseService } from "arkos/services";
+{{#if typescript}}
+import { Prisma } from "@prisma/client"
 
-class AuthPermissionService extends BaseService {
-  constructor() {
-    super("auth-permission");
-  }
-  // Add your custom service methods here
-}
+class AuthPermissionService extends BaseService<Prisma.AuthPermissionDelegate> {}
+{{else}}
 
-const authPermissionService = new AuthPermissionService();
+class AuthPermissionService extends BaseService {}
+{{/if}}
+
+const authPermissionService = new AuthPermissionService("auth-permission");
 
 export default authPermissionService;

package/templates/basic/src/modules/auth-role/auth-role.auth.ts.hbs

@@ -1,6 +1,16 @@
 {{#if typescript}}
-import { AuthConfigs } from "arkos/auth"
+import { AuthConfigs } from "arkos/auth";
+{{/if}}
+import { authService } from "arkos/services";
+
+export const authRolePermissions = {
+  canCreate: authService.permission("Create", "auth-role"),
+  canUpdate: authService.permission("Update", "auth-role"),
+  canDelete: authService.permission("Delete", "auth-role"),
+  canView: authService.permission("View", "auth-role"),
+}
 
+{{#if typescript}}
 const authRoleAuthConfigs: AuthConfigs = {
 {{else}}
 /** @type {import('arkos/auth').AuthConfigs} */
@@ -14,10 +24,34 @@ const authRoleAuthConfigs = {
   },
   {{#if (eq authentication.type "static")}}
   accessControl: {
-    // Create: ["Admin"],
-    // Update: ["Admin", "Manager"],
-    // Delete: ["Admin"],
-    // View: ["User", "Admin", "Guest"],
+    // Create: {
+    {{#if (eq authentication.type "static")}}
+    //   roles: [],
+    {{/if}}
+    //   name: "Create New Auth Role",
+    //   description: "Permission to create auth role records"
+    // },
+    // Update: {
+    {{#if (eq authentication.type "static")}}
+    //   roles: [],
+    {{/if}}
+    //   name: "Update Auth Role",
+    //   description: "Permission to update auth role records"
+    // },
+    // Delete: {
+    {{#if (eq authentication.type "static")}}
+    //   roles: [],
+    {{/if}}
+    //   name: "Delete Auth Role",
+    //   description: "Permission to delete auth role records"
+    // },
+    // View: {
+    {{#if (eq authentication.type "static")}}
+    //   roles: [],
+    {{/if}}
+    //   name: "View Auth Role",
+    //   description: "Permission to update auth role records"
+    // },
   },
   {{/if}}
 };

package/templates/basic/src/modules/auth-role/auth-role.query.ts.hbs

@@ -1,11 +1,11 @@
 {{#if typescript}}
-import prisma from "../../utils/prisma/index.js";
+import { Prisma } from "@prisma/client"
 import { PrismaQueryOptions } from 'arkos/prisma';
 
-const authRoleQueryOptions: PrismaQueryOptions<typeof prisma.authRole> = {
+const authRoleQueryOptions: PrismaQueryOptions<Prisma.AuthRoleDelegate> = {
 {{else}}
 /**
- * @type {import("arkos/prisma").PrismaQueryOptions<typeof import('../../utils/prisma/index.js').prisma.authRole>}
+ * @type {import("arkos/prisma").PrismaQueryOptions<typeof import("@prisma/client").Prisma.AuthRoleDelegate>}
  */
 const authRoleQueryOptions = {
 {{/if}}

package/templates/basic/src/modules/auth-role/auth-role.service.ts.hbs

@@ -1,12 +1,13 @@
 import { BaseService } from "arkos/services";
+{{#if typescript}}
+import { Prisma } from "@prisma/client"
 
-class AuthRoleService extends BaseService {
-  constructor() {
-    super("auth-role");
-  }
-  // Add your custom service methods here
-}
+class AuthRoleService extends BaseService<Prisma.AuthRoleDelegate> {}
+{{else}}
 
-const authRoleService = new AuthRoleService();
+class AuthRoleService extends BaseService {}
+{{/if}}
+
+const authRoleService = new AuthRoleService("auth-role");
 
 export default authRoleService;

package/templates/basic/src/modules/file-upload/file-upload.auth.ts.hbs

@@ -14,10 +14,34 @@ const fileUplaodAuthConfigs = {
   },
   {{#if (eq authentication.type "static")}}
   accessControl: {
-    // Create: ["Admin"],
-    // Update: ["Admin", "Manager"],
-    // Delete: ["Admin"],
-    // View: ["User", "Admin", "Guest"],
+    // Create: {
+    {{#if (eq authentication.type "static")}}
+    //   roles: [],
+    {{/if}}
+    //   name: "Upload File",
+    //   description: "Permission to upload file"
+    // },
+    // Update: {
+    {{#if (eq authentication.type "static")}}
+    //   roles: [],
+    {{/if}}
+    //   name: "Update File",
+    //   description: "Permission to update file"
+    // },
+    // Delete: {
+    {{#if (eq authen.type "static")}}
+    //   roles: [],
+    {{/if}}
+    //   name: "Delete File",
+    //   description: "Permission to delete file"
+    // },
+    // View: {
+    {{#if (eq authen.type "static")}}
+    //   roles: [],
+    {{/if}}
+    //   name: "View File",
+    //   description: "Permission to view file"
+    // },
   },
   {{/if}}
 };

package/templates/basic/src/modules/file-upload/file-upload.middlewares.ts.hbs

@@ -1,77 +1,83 @@
 {{#if typescript}}
 import { ArkosRequest, ArkosResponse, ArkosNextFunction } from "arkos";
 
-// export const beforeFindFile = async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
-//   // Your logic here
+// export const beforeFindFile = [async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
 //   next();
-// };
+// }];
 // 
-// // There is not afterFindFile: because the main handler is handled by express.static()
-// 
-// export const beforeUploadFile = async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
-//   // Your logic here
+// export const beforeUploadFile = [async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
 //   next();
-// };
+// }];
 // 
-// export const afterUploadFile = async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
-//   // Your logic here
+// export const afterUploadFile = [async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
+//   next();
+// }];
+
+// export const onUploadFileError = [async (err: any, req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
 //   next();
-// };
+// }];
 // 
-// export const beforeUpdateFile = async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
-//   // Your logic here
+// export const beforeUpdateFile = [async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
 //   next();
-// };
+// }];
 // 
-// export const afterUpdateFile = async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
-//   // Your logic here
+// export const afterUpdateFile = [async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
 //   next();
-// };
+// }];
 // 
-// export const beforeDeleteFile = async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
-//   // Your logic here
+// export const onUpdateFileError = [async (err: any, req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
 //   next();
-// };
+// }];
+
+// export const beforeDeleteFile = [async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
+//   next();
+// }];
 // 
-// export const afterDeleteFile = async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
-//   // Your logic here
+// export const afterDeleteFile = [async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
+//   next();
+// }];
+
+// export const onDeleteFileError = [async (err: any, req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
 //   next();
-// };
+// }];
 {{else}}
-// export const beforeFindFile = async (req, res, next) => {
-//   // Your logic here
+// export const beforeFindFile = [async (req, res, next) => {
 //   next();
-// };
+// }];
 // 
-// // There is not afterFindFile: because the main handler is handled by express.static()
-// 
-// export const beforeUploadFile = async (req, res, next) => {
-//   // Your logic here
+// export const beforeUploadFile = [async (req, res, next) => {
 //   next();
-// };
+// }];
 // 
-// export const afterUploadFile = async (req, res, next) => {
-//   // Your logic here
+// export const afterUploadFile = [async (req, res, next) => {
 //   next();
-// };
+// }];
 // 
-// export const beforeUpdateFile = async (req, res, next) => {
-//   // Your logic here
+// export const onUploadFileError = [async (err, req, res, next) => {
+//   next();
+// }];
+
+// export const beforeUpdateFile = [async (req, res, next) => {
 //   next();
-// };
+// }];
 // 
-// export const afterUpdateFile = async (req, res, next) => {
-//   // Your logic here
+// export const afterUpdateFile = [async (req, res, next) => {
 //   next();
-// };
+// }];
 // 
-// export const beforeDeleteFile = async (req, res, next) => {
-//   // Your logic here
+// export const onUpdateFileError = [async (err, req, res, next) => {
 //   next();
-// };
+// }];
+
+// export const beforeDeleteFile = [async (req, res, next) => {
+//   next();
+// }];
 // 
-// export const afterDeleteFile = async (req, res, next) => {
-//   // Your logic here
+// export const afterDeleteFile = [async (req, res, next) => {
+//   next();
+// }];
+
+// export const onDeleteFileError = [async (err, req, res, next) => {
 //   next();
-// };
+// }];
 {{/if}}

package/templates/basic/src/modules/user/user.auth.ts.hbs

@@ -1,6 +1,16 @@
 {{#if typescript}}
-import { AuthConfigs } from "arkos/auth"
+import { AuthConfigs } from "arkos/auth";
+{{/if}}
+import { authService } from "arkos/services";
+
+export const userPermissions = {
+  canCreate: authService.permission("Create", "user"),
+  canUpdate: authService.permission("Update", "user"),
+  canDelete: authService.permission("Delete", "user"),
+  canView: authService.permission("View", "user"),
+}
 
+{{#if typescript}}
 const userAuthConfigs: AuthConfigs = {
 {{else}}
 /** @type {import('arkos/auth').AuthConfigs} */
@@ -14,10 +24,34 @@ const userAuthConfigs = {
   },
   {{#if (eq authentication.type "static")}}
   accessControl: {
-    // Create: ["Admin"],
-    // Update: ["Admin", "Manager"],
-    // Delete: ["Admin"],
-    // View: ["User", "Admin", "Guest"],
+    // Create: {
+    {{#if (eq authentication.type "static")}}
+    //   roles: [],
+    {{/if}}
+    //   name: "Create New User",
+    //   description: "Permission to create user records"
+    // },
+    // Update: {
+    {{#if (eq authentication.type "static")}}
+    //   roles: [],
+    {{/if}}
+    //   name: "Update User",
+    //   description: "Permission to update user records"
+    // },
+    // Delete: {
+    {{#if (eq authentication.type "static")}}
+    //   roles: [],
+    {{/if}}
+    //   name: "Delete User",
+    //   description: "Permission to delete user records"
+    // },
+    // View: {
+    {{#if (eq authentication.type "static")}}
+    //   roles: [],
+    {{/if}}
+    //   name: "View User",
+    //   description: "Permission to update user records"
+    // },
   },
   {{/if}}
 };

package/templates/basic/src/modules/user/user.middlewares.ts.hbs

@@ -1,163 +1,195 @@
 {{#if typescript}}
 import { ArkosRequest, ArkosResponse, ArkosNextFunction } from "arkos";
 
-// export const beforeCreateOne = async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
-//   // Your logic here
-//   next();
-// };
-// 
-// export const afterCreateOne = async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
-//   // Your logic here
-//   next();
-// };
-// 
-// export const beforeFindOne = async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
-//   // Your logic here
-//   next();
-// };
-// 
-// export const afterFindOne = async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
-//   // Your logic here
-//   next();
-// };
-// 
-// export const beforeFindMany = async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
-//   // Your logic here
-//   next();
-// };
-// 
-// export const afterFindMany = async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
-//   // Your logic here
-//   next();
-// };
-// 
-// export const beforeUpdateOne = async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
-//   // Your logic here
-//   next();
-// };
-// 
-// export const afterUpdateOne = async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
-//   // Your logic here
-//   next();
-// };
-// 
-// export const beforeDeleteOne = async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
-//   // Your logic here
-//   next();
-// };
-// 
-// export const afterDeleteOne = async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
-//   // Your logic here
-//   next();
-// };
-// 
-// export const beforeCreateMany = async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
-//   // Your logic here
-//   next();
-// };
-// 
-// export const afterCreateMany = async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
-//   // Your logic here
-//   next();
-// };
-// 
-// export const beforeUpdateMany = async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
-//   // Your logic here
-//   next();
-// };
-// 
-// export const afterUpdateMany = async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
-//   // Your logic here
-//   next();
-// };
-// 
-// export const beforeDeleteMany = async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
-//   // Your logic here
-//   next();
-// };
-// 
-// export const afterDeleteMany = async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
-//   // Your logic here
-//   next();
-// };
+// export const beforeCreateOne = [async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
+//   next();
+// }];
+
+// export const afterCreateOne = [async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
+//   next();
+// }];
+
+// export const onCreateOneError = [async (err: any, req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
+//   next();
+// }];
+
+// export const beforeFindOne = [async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
+//   next();
+// }];
+
+// export const afterFindOne = [async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
+//   next();
+// }];
+
+// export const onFindOneError = [async (err: any, req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
+//   next();
+// }];
+
+// export const beforeFindMany = [async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
+//   next();
+// }];
+
+// export const afterFindMany = [async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
+//   next();
+// }];
+
+// export const onFindManyError = [async (err: any, req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
+//   next();
+// }];
+
+// export const beforeUpdateOne = [async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
+//   next();
+// }];
+
+// export const afterUpdateOne = [async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
+//   next();
+// }];
+
+// export const onUpdateOneError = [async (err: any, req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
+//   next();
+// }];
+
+// export const beforeDeleteOne = [async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
+//   next();
+// }];
+
+// export const afterDeleteOne = [async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
+//   next();
+// }];
+
+// export const onDeleteOneError = [async (err: any, req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
+//   next();
+// }];
+
+// export const beforeCreateMany = [async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
+//   next();
+// }];
+
+// export const afterCreateMany = [async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
+//   next();
+// }];
+
+// export const onCreateManyError = [async (err: any, req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
+//   next();
+// }];
+
+// export const beforeUpdateMany = [async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
+//   next();
+// }];
+
+// export const afterUpdateMany = [async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
+//   next();
+// }];
+
+// export const onUpdateManyError = [async (err: any, req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
+//   next();
+// }];
+
+// export const beforeDeleteMany = [async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
+//   next();
+// }];
+
+// export const afterDeleteMany = [async (req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
+//   next();
+// }];
+
+// export const onDeleteManyError = [async (err: any, req: ArkosRequest, res: ArkosResponse, next: ArkosNextFunction) => {
+//   next();
+// }];
 {{else}}
-// export const beforeCreateOne = async (req, res, next) => {
-//   // Your logic here
-//   next();
-// };
-// 
-// export const afterCreateOne = async (req, res, next) => {
-//   // Your logic here
-//   next();
-// };
-// 
-// export const beforeFindOne = async (req, res, next) => {
-//   // Your logic here
-//   next();
-// };
-// 
-// export const afterFindOne = async (req, res, next) => {
-//   // Your logic here
-//   next();
-// };
-// 
-// export const beforeFindMany = async (req, res, next) => {
-//   // Your logic here
-//   next();
-// };
-// 
-// export const afterFindMany = async (req, res, next) => {
-//   // Your logic here
-//   next();
-// };
-// 
-// export const beforeUpdateOne = async (req, res, next) => {
-//   // Your logic here
-//   next();
-// };
-// 
-// export const afterUpdateOne = async (req, res, next) => {
-//   // Your logic here
-//   next();
-// };
-// 
-// export const beforeDeleteOne = async (req, res, next) => {
-//   // Your logic here
-//   next();
-// };
-// 
-// export const afterDeleteOne = async (req, res, next) => {
-//   // Your logic here
-//   next();
-// };
-// 
-// export const beforeCreateMany = async (req, res, next) => {
-//   // Your logic here
-//   next();
-// };
-// 
-// export const afterCreateMany = async (req, res, next) => {
-//   // Your logic here
-//   next();
-// };
-// 
-// export const beforeUpdateMany = async (req, res, next) => {
-//   // Your logic here
-//   next();
-// };
-// 
-// export const afterUpdateMany = async (req, res, next) => {
-//   // Your logic here
-//   next();
-// };
-// 
-// export const beforeDeleteMany = async (req, res, next) => {
-//   // Your logic here
-//   next();
-// };
-// 
-// export const afterDeleteMany = async (req, res, next) => {
-//   // Your logic here
-//   next();
-// };
+// export const beforeCreateOne = [async (req, res, next) => {
+//   next();
+// }];
+
+// export const afterCreateOne = [async (req, res, next) => {
+//   next();
+// }];
+
+// export const onCreateOneError = [async (err, req, res, next) => {
+//   next();
+// }];
+
+// export const beforeFindOne = [async (req, res, next) => {
+//   next();
+// }];
+
+// export const afterFindOne = [async (req, res, next) => {
+//   next();
+// }];
+
+// export const onFindOneError = [async (err, req, res, next) => {
+//   next();
+// }];
+
+// export const beforeFindMany = [async (req, res, next) => {
+//   next();
+// }];
+
+// export const afterFindMany = [async (req, res, next) => {
+//   next();
+// }];
+
+// export const onFindManyError = [async (err, req, res, next) => {
+//   next();
+// }];
+
+// export const beforeUpdateOne = [async (req, res, next) => {
+//   next();
+// }];
+
+// export const afterUpdateOne = [async (req, res, next) => {
+//   next();
+// }];
+
+// export const onUpdateOneError = [async (err, req, res, next) => {
+//   next();
+// }];
+
+// export const beforeDeleteOne = [async (req, res, next) => {
+//   next();
+// }];
+
+// export const afterDeleteOne = [async (req, res, next) => {
+//   next();
+// }];
+
+// export const onDeleteOneError = [async (err, req, res, next) => {
+//   next();
+// }];
+
+// export const beforeCreateMany = [async (req, res, next) => {
+//   next();
+// }];
+
+// export const afterCreateMany = [async (req, res, next) => {
+//   next();
+// }];
+
+// export const onCreateManyError = [async (err, req, res, next) => {
+//   next();
+// }];
+
+// export const beforeUpdateMany = [async (req, res, next) => {
+//   next();
+// }];
+
+// export const afterUpdateMany = [async (req, res, next) => {
+//   next();
+// }];
+
+// export const onUpdateManyError = [async (err, req, res, next) => {
+//   next();
+// }];
+
+// export const beforeDeleteMany = [async (req, res, next) => {
+//   next();
+// }];
+
+// export const afterDeleteMany = [async (req, res, next) => {
+//   next();
+// }];
+
+// export const onDeleteManyError = [async (err, req, res, next) => {
+//   next();
+// }];
 {{/if}}

package/templates/basic/src/modules/user/user.query.ts.hbs

@@ -1,81 +1,78 @@
 {{#if typescript}}
-import prisma from "../../utils/prisma/index.js";
 import { PrismaQueryOptions } from 'arkos/prisma';
+import { Prisma } from "@prisma/client"
 
-const userQueryOptions: PrismaQueryOptions<typeof prisma.user> = {
+const userQueryOptions: PrismaQueryOptions<Prisma.UserDelegate> = {
 {{else}}
 /**
- * @type {import("arkos/prisma").PrismaQueryOptions<typeof import('../../utils/prisma/index.js').prisma.user>}
+ * @type {import("arkos/prisma").PrismaQueryOptions<typeof import("@prisma/client").Prisma.UserDelegate>}
  */
 const userQueryOptions = {
 {{/if}}
-    global: {},
-    find: {
-      omit: {
-        password: true,
-      }, 
-      {{#if (eq authentication.type "dynamic")}}
-      include: {
-        {{#if authentication.multipleRoles}}
-        roles: {
-          include: {
-            role: true,
-          }
-        },
-          {{else}}
-        role: {
-          include: {
-            role: true,
-          }
-        },
-        {{/if}}
+  global: {
+    omit: {
+      password: true,
+    }, 
+  },
+  find: {
+    {{#if (eq authentication.type "dynamic")}}
+    include: {
+      {{#if authentication.multipleRoles}}
+      roles: {
+        include: {
+          role: true,
+        }
+      },
+        {{else}}
+      role: {
+        include: {
+          role: true,
+        }
       },
       {{/if}}
     },
-    findOne: {
-      {{#if (eq authentication.type "dynamic")}}
-      include: {
-        {{#if authentication.multipleRoles}}
-        roles: {
-          include: {
-            role: {
-              include: {
-                permissions: true
-              }
+    {{/if}}
+  },
+  findOne: {
+    {{#if (eq authentication.type "dynamic")}}
+    include: {
+      {{#if authentication.multipleRoles}}
+      roles: {
+        include: {
+          role: {
+            include: {
+              permissions: true
             }
           }
-        },
-          {{else}}
-        role: {
-          include: {
-            role: {
-              include: {
-                permissions: true
-              }
+        }
+      },
+        {{else}}
+      role: {
+        include: {
+          role: {
+            include: {
+              permissions: true
             }
           }
-        },
-        {{/if}}
+        }
       },
       {{/if}}
     },
-    findMany: {},
-    update: {},
-    updateMany: {},
-    updateOne: {},
-    create: {},
-    createMany: {},
-    createOne: {},
-    save: {
-      omit: {
-        password: true,
-      },
-    },
-    saveMany: {},
-    saveOne: {},
-    delete: {},
-    deleteMany: {},
-    deleteOne: {},
+    {{/if}}
+  },
+  findMany: {},
+  update: {},
+  updateMany: {},
+  updateOne: {},
+  create: {},
+  createMany: {},
+  createOne: {},
+  save: {},
+  saveMany: {},
+  saveOne: {},
+  delete: {},
+  deleteMany: {},
+  deleteOne: {},
 }
 
 export default userQueryOptions;

package/templates/basic/src/modules/user/user.service.ts.hbs

@@ -1,19 +1,13 @@
-{{#if typescript}}
-import prisma from "../../utils/prisma";
 import { BaseService } from "arkos/services";
+{{#if typescript}}
+import { Prisma } from "@prisma/client"
 
-class UserService extends BaseService<typeof prisma.user> {
+class UserService extends BaseService<Prisma.UserDelegate> {}
 {{else}}
-import { BaseService } from "arkos/services";
 
-class UserService extends BaseService {
+class UserService extends BaseService {}
 {{/if}}
-  constructor() {
-    super("user");
-  }
-  // Add your custom service methods here
-}
 
-const userService = new UserService();
+const userService = new UserService("user");
 
 export default userService;