create-arkos 2.0.0-next.18 → 2.0.0-next.19

package/package.json

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

package/templates/basic/.gitignore.hbs

@@ -24,6 +24,7 @@ pnpm-lock.yaml
 /.build
 /coverage
 /.nyc_output
+/src/generated
 
 # Arkos.js' base uploads directory
 /uploads
@@ -79,6 +80,7 @@ $RECYCLE.BIN/
 .dynamodb/
 .webpack/
 .next/
+.arkos/
 .nuxt/
 .cache/
 .docz/

package/templates/basic/jsconfig.json.hbs

@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
-    "target": "ES6",
-    "module": "es2020",
+    "target": "es2022",
+    "module": "es2022",
     "moduleResolution": "bundler",
     "rootDir": ".",
     "baseUrl": ".",
@@ -20,5 +20,5 @@
     }
   },
   "include": ["src/**/*.js", "src/**/*.jsx", "packages/**/*.js", "arkos.config.js"],
-  "exclude": ["node_modules", ".build", "src/**/__tests__/**", "src/**/*.test", "src/**/*.spec", "build", "dist", "uploads"]
+  "exclude": ["node_modules", ".build", "src/**/__tests__/**", "src/**/*.test", "src/**/*.spec", "build", "dist", "uploads", "src/generated", ".arkos"]
 }

package/templates/basic/package.json.hbs

@@ -2,7 +2,7 @@
   "name": "{{projectName}}",
   "version": "1.0.0",
   "type": "module",
-  "description": "This RESTful API was generated by create-arkos, 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](https://www.arkosjs.com)",
   "scripts": {
     "dev": "arkos dev",
     "build": "arkos build",
@@ -14,30 +14,46 @@
   },
   "devDependencies": {
     {{#if typescript}}
-    "typescript": "5.7.3",
-    "@types/node": "24.0.12",
-    "@types/express": "5.0.0",
+    "typescript": "7.0.2",
+    "@types/node": "26.1.1",
+    "@types/express": "5.0.6",
     {{/if}}
     "tsx-strict": "0.8.0",
     "tsx": "4.23.1"{{#if (neq prisma.provider "none")}},
-    "prisma": "6.19.3"
+    "prisma": "7.9.0"
     {{/if}}
   },
   "dependencies": {
-    "arkos": "2.0.0-next.18", 
-    "express": "4.22.2",
-    "@scalar/express-api-reference": "0.10.2",
-    "@scalar/api-reference": "1.55.3"{{#if (or (neq prisma.provider "none") validation.type)}},{{/if}}
+    "arkos": "2.0.0-next.19", 
+    "express": "5.2.1",
+    "@scalar/express-api-reference": "0.10.11",
+    "@scalar/api-reference": "1.63.0"{{#if (or (neq prisma.provider "none") validation.type)}},{{/if}}
     {{#if (neq prisma.provider "none")}}
-    "@prisma/client": "6.19.3"{{#if validation.type}},{{/if}}
+    "@prisma/client": "7.9.0",
+    {{#if (eq prisma.provider "postgresql")}}
+    "@prisma/adapter-pg": "7.9.0",
+    {{/if}}
+    {{#if (eq prisma.provider "cockroachdb")}}
+    "@prisma/adapter-pg": "7.9.0",
+    {{/if}}
+    {{#if (eq prisma.provider "mysql")}}
+    "@prisma/adapter-mariadb": "7.9.0",
+    {{/if}}
+    {{#if (eq prisma.provider "sqlite")}}
+    "@prisma/adapter-better-sqlite3": "7.9.0",
+    {{/if}}
+    {{#if (eq prisma.provider "sqlserver")}}
+    "@prisma/adapter-mssql": "7.9.0",
+    {{/if}}
+    {{#if validation.type}},{{/if}}
     {{/if}}
     {{#if (eq validation.type "class-validator")}}
     "reflect-metadata": "0.2.2",
     "class-transformer": "0.5.1",
-    "class-validator": "0.14.1"
+    "class-validator": "0.15.1"
     {{/if}}
     {{#if (eq validation.type "zod")}}
-    "zod": "3.25.76"
+    "zod": "4.4.3"
     {{/if}}
   }
 }

package/templates/basic/prisma/schema/schema.prisma.hbs

@@ -1,9 +1,8 @@
 generator client {
-  provider = "prisma-client-js"
+  provider = "prisma-client"
+  output   = "../src/generated/prisma"
 }
 
 datasource db {
   provider = "{{prisma.provider}}"
-  url      = env("DATABASE_URL")
 }
-

package/templates/basic/prisma.config.ts.hbs

@@ -0,0 +1,10 @@
+import { loadEnvironmentVariables } from "arkos/utils";
+loadEnvironmentVariables()
+
+import { defineConfig, env } from "prisma/config";
+
+export default defineConfig({
+  datasource: {
+    url: env("DATABASE_URL"),
+  },
+});

package/templates/basic/src/modules/auth/dtos/login.dto.ts.hbs

@@ -8,7 +8,7 @@ const LoginDto = z.object({
 
 export default LoginDto;
 {{#if typescript}}
-export type LoginDtoType = z.infer<typeof LoginDto>;
+export type LoginDto = z.infer<typeof LoginDto>;
 {{/if}}
 {{/if}}
 {{#if (eq validation.type "class-validator")}}

package/templates/basic/src/modules/auth/dtos/signup.dto.ts.hbs

@@ -8,7 +8,7 @@ const SignupDto = z.object({
 
 export default SignupDto;
 {{#if typescript}}
-export type SignupDtoType = z.infer<typeof SignupDto>;
+export type SignupDto = z.infer<typeof SignupDto>;
 {{/if}}
 {{/if}}
 {{#if (eq validation.type "class-validator")}}

package/templates/basic/src/modules/auth/dtos/update-me.dto.ts.hbs

@@ -7,7 +7,7 @@ const UpdateMeDto = z.object({
 
 export default UpdateMeDto;
 {{#if typescript}}
-export type UpdateMeDtoType = z.infer<typeof UpdateMeDto>;
+export type UpdateMeDto = z.infer<typeof UpdateMeDto>;
 {{/if}}
 {{/if}}
 {{#if (eq validation.type "class-validator")}}

package/templates/basic/src/modules/auth/dtos/update-password.dto.ts.hbs

@@ -8,7 +8,7 @@ const UpdatePasswordDto = z.object({
 
 export default UpdatePasswordDto;
 {{#if typescript}}
-export type UpdatePasswordDtoType = z.infer<typeof UpdatePasswordDto>;
+export type UpdatePasswordDto = z.infer<typeof UpdatePasswordDto>;
 {{/if}}
 {{/if}}
 {{#if (eq validation.type "class-validator")}}

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

@@ -1,11 +1,9 @@
-import { BaseService } from "arkos/services";
-{{#if typescript}}
-import { Prisma } from "@prisma/client"
+import { ArkosPrismaService } from "arkos/services";
 
-class AuthPermissionService extends BaseService<"auth-permission"> {}
+{{#if typescript}}
+class AuthPermissionService extends ArkosPrismaService<"auth-permission"> {}
 {{else}}
-
-class AuthPermissionService extends BaseService {}
+class AuthPermissionService extends ArkosPrismaService {}
 {{/if}}
 
 const authPermissionService = new AuthPermissionService("auth-permission");

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

@@ -12,7 +12,7 @@ const CreateAuthPermissionDto = z.object({
 
 export default CreateAuthPermissionDto;
 {{#if typescript}}
-export type CreateAuthPermissionDtoType = z.infer<typeof CreateAuthPermissionDto>;
+export type CreateAuthPermissionDto = z.infer<typeof CreateAuthPermissionDto>;
 {{/if}}
 {{/if}}
 {{#if (eq validation.type "class-validator")}}

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

@@ -18,7 +18,7 @@ const QueryAuthPermissionDto = z.object({
 
 export default QueryAuthPermissionDto;
 {{#if typescript}}
-export type QueryAuthPermissionDtoType = z.infer<typeof QueryAuthPermissionDto>;
+export type QueryAuthPermissionDto = z.infer<typeof QueryAuthPermissionDto>;
 {{/if}}
 {{/if}}
 {{#if (eq validation.type "class-validator")}}

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

@@ -12,7 +12,7 @@ const UpdateAuthPermissionDto = z.object({
 
 export default UpdateAuthPermissionDto;
 {{#if typescript}}
-export type UpdateAuthPermissionDtoType = z.infer<typeof UpdateAuthPermissionDto>;
+export type UpdateAuthPermissionDto = z.infer<typeof UpdateAuthPermissionDto>;
 {{/if}}
 {{/if}}
 {{#if (eq validation.type "class-validator")}}

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

@@ -1,11 +1,9 @@
-import { BaseService } from "arkos/services";
-{{#if typescript}}
-import { Prisma } from "@prisma/client"
+import { ArkosPrismaService } from "arkos/services";
 
-class AuthRoleService extends BaseService<"auth-role"> {}
+{{#if typescript}}
+class AuthRoleService extends ArkosPrismaService<"auth-role"> {}
 {{else}}
-
-class AuthRoleService extends BaseService {}
+class AuthRoleService extends ArkosPrismaService {}
 {{/if}}
 
 const authRoleService = new AuthRoleService("auth-role");

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

@@ -15,7 +15,7 @@ const CreateAuthRoleDto = z.object({
 
 export default CreateAuthRoleDto;
 {{#if typescript}}
-export type CreateAuthRoleDtoType = z.infer<typeof CreateAuthRoleDto>;
+export type CreateAuthRoleDto = z.infer<typeof CreateAuthRoleDto>;
 {{/if}}
 {{/if}}
 {{#if (eq validation.type "class-validator")}}

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

@@ -22,7 +22,7 @@ const QueryAuthRoleDto = z.object({
 
 export default QueryAuthRoleDto;
 {{#if typescript}}
-export type QueryAuthRoleDtoType = z.infer<typeof QueryAuthRoleDto>;
+export type QueryAuthRoleDto = z.infer<typeof QueryAuthRoleDto>;
 {{/if}}
 {{/if}}
 {{#if (eq validation.type "class-validator")}}

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

@@ -17,7 +17,7 @@ const UpdateAuthRoleDto = z.object({
 
 export default UpdateAuthRoleDto;
 {{#if typescript}}
-export type UpdateAuthRoleDtoType = z.infer<typeof UpdateAuthRoleDto>;
+export type UpdateAuthRoleDto = z.infer<typeof UpdateAuthRoleDto>;
 {{/if}}
 {{/if}}
 {{#if (eq validation.type "class-validator")}}

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

@@ -24,7 +24,7 @@ fileUploadRouteHook.deleteFile({
 
 const fileUploadRouter = ArkosRouter({
   prefix: config?.fileUpload?.baseRoute,
-  openapi: { tags: ["File Uploads"] },
+  openapi: { tags: ["File Upload"] },
 });
 
 fileUploadRouter.load(fileUploadRouteHook);

package/templates/basic/src/modules/user/dtos/create-user.dto.ts.hbs

@@ -20,9 +20,9 @@ const CreateUserDto = z.object({
   role: z.string(),
   {{else}}
   {{#if authentication.multipleRoles}}
-  roles: z.array(z.nativeEnum(UserRole)),
+  roles: z.array(z.enum(UserRole)),
   {{else}}
-  role: z.nativeEnum(UserRole),
+  role: z.enum(UserRole),
   {{/if}}
   {{/if}}
   {{else}}
@@ -40,7 +40,7 @@ const CreateUserDto = z.object({
 
 export default CreateUserDto;
 {{#if typescript}}
-export type CreateUserDtoType = z.infer<typeof CreateUserDto>;
+export type CreateUserDto = z.infer<typeof CreateUserDto>;
 {{/if}}
 {{/if}}
 {{#if (eq validation.type "class-validator")}}

package/templates/basic/src/modules/user/dtos/update-user.dto.ts.hbs

@@ -22,9 +22,9 @@ const UpdateUserDto = z.object({
   role: z.string().optional(),
   {{else}}
   {{#if authentication.multipleRoles}}
-  roles: z.array(z.nativeEnum(UserRole)).optional(),
+  roles: z.array(z.enum(UserRole)).optional(),
   {{else}}
-  role: z.nativeEnum(UserRole).optional(),
+  role: z.enum(UserRole).optional(),
   {{/if}}
   {{/if}}
   {{else}}
@@ -46,7 +46,7 @@ const UpdateUserDto = z.object({
 
 export default UpdateUserDto;
 {{#if typescript}}
-export type UpdateUserDtoType = z.infer<typeof UpdateUserDto>;
+export type UpdateUserDto = z.infer<typeof UpdateUserDto>;
 {{/if}}
 {{/if}}
 {{#if (eq validation.type "class-validator")}}

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

@@ -1,11 +1,9 @@
-import { BaseService } from "arkos/services";
-{{#if typescript}}
-import { Prisma } from "@prisma/client"
+import { ArkosPrismaService } from "arkos/services";
 
-class UserService extends BaseService<"user"> {}
+{{#if typescript}}
+class UserService extends ArkosPrismaService<"user"> {}
 {{else}}
-
-class UserService extends BaseService {}
+class UserService extends ArkosPrismaService {}
 {{/if}}
 
 const userService = new UserService("user");

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

@@ -1,7 +1,7 @@
 import app from "@/src/app";
 import http from "node:http";
 
-await app.build();
+app.build();
 
 const server = http.createServer(app);
 

package/templates/basic/src/utils/prisma/index.ts.hbs

@@ -1,5 +1,51 @@
-import { PrismaClient } from "@prisma/client";
+{{#if (eq prisma.provider "postgresql")}}
+import { PrismaClient } from "@/src/generated/prisma/client";
+import { PrismaPg } from "@prisma/adapter-pg";
 
-export const prisma = new PrismaClient();
+const adapter = new PrismaPg({ connectionString: process.env.DATABASE_URL{{#if typescript}} as string{{/if}} });
+export const prisma = new PrismaClient({ adapter });
+{{/if}}
+{{#if (eq prisma.provider "cockroachdb")}}
+import { PrismaClient } from "@/src/generated/prisma/client";
+import { PrismaPg } from "@prisma/adapter-pg";
+
+// CockroachDB uses the PostgreSQL wire protocol, so it shares the pg adapter
+const adapter = new PrismaPg({ connectionString: process.env.DATABASE_URL{{#if typescript}} as string{{/if}} });
+export const prisma = new PrismaClient({ adapter });
+{{/if}}
+{{#if (eq prisma.provider "mysql")}}
+import { PrismaClient } from "@/src/generated/prisma/client";
+import { PrismaMariaDb } from "@prisma/adapter-mariadb";
+
+const dbUrl = new URL(process.env.DATABASE_URL{{#if typescript}} as string{{/if}});
+const adapter = new PrismaMariaDb({
+  host: dbUrl.hostname,
+  port: Number(dbUrl.port) || 3306,
+  user: decodeURIComponent(dbUrl.username),
+  password: decodeURIComponent(dbUrl.password),
+  database: dbUrl.pathname.replace(/^\//, ""),
+  connectionLimit: 5,
+});
+export const prisma = new PrismaClient({ adapter });
+{{/if}}
+{{#if (eq prisma.provider "sqlite")}}
+import { PrismaClient } from "@/src/generated/prisma/client";
+import { PrismaBetterSqlite3 } from "@prisma/adapter-better-sqlite3";
+
+const adapter = new PrismaBetterSqlite3({
+  url: process.env.DATABASE_URL || "file:./dev.db",
+});
+export const prisma = new PrismaClient({ adapter });
+{{/if}}
+{{#if (eq prisma.provider "sqlserver")}}
+import { PrismaClient } from "@/src/generated/prisma/client";
+import { PrismaMssql } from "@prisma/adapter-mssql";
+
+const adapter = new PrismaMssql(process.env.DATABASE_URL{{#if typescript}} as string{{/if}});
+export const prisma = new PrismaClient({ adapter });
+{{/if}}
+{{#if (eq prisma.provider "none")}}
+export const prisma = null;
+{{/if}}
 
 export default prisma;

package/templates/basic/src/utils/validation/api-actions.ts.hbs

@@ -1,5 +1,5 @@
 /**
-* A simple array of available `apiAction` field when using auto generate API (That uses BaseService)
+* A simple array of available `apiAction` field when using auto generate API (That uses ArkosPrismaService)
 * class behind the scenes.
 * 
 * Is worth mentioning that this will be addded into `arkos` as an util.

package/templates/basic/tsconfig.json.hbs

@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
-    "target": "es2020",
-    "module": "es2020",
+    "target": "es2022",
+    "module": "es2022",
     "moduleResolution": "bundler",
     "rootDir": ".",
     "baseUrl": ".",
@@ -15,11 +15,12 @@
     "lib": ["es6", "dom"],
     "noImplicitAny": true,
     "paths": {
-      "@/*": ["./*"]
+      "@/*": ["./*"],
+      "@arkosjs/generated": ["./.arkos/index.d.ts"] 
     }
   },
   "include": ["src/**/*.ts", "src/**/*.js", "src/**/*.tsx",  "src/**/*.jsx", "arkos.config.ts"],
-  "exclude": ["node_modules", ".build", "src/**/__tests__/**", "src/**/*.test", "src/**/*.spec", "temp", "dist", "build", "uploads"],
+  "exclude": ["node_modules", ".build", "src/**/__tests__/**", "src/**/*.test", "src/**/*.spec", "temp", "dist", "build", "uploads", "src/generated", ".arkos"],
   "watchOptions": {
     "excludeDirectories": ["**/node_modules", "node_modules"]
   }