lapeh 2.2.7 → 2.2.9

package/api-testing-tujuhbelas/src/models/core.prisma

@@ -0,0 +1,163 @@
+model cache {
+  key        String @id
+  value      String
+  expiration Int
+}
+
+model cache_locks {
+  key        String @id
+  owner      String
+  expiration Int
+}
+
+model failed_jobs {
+  id         BigInt   @id @default(autoincrement())
+  uuid       String   @unique
+  connection String
+  queue      String
+  payload    String
+  exception  String
+  failed_at  DateTime @default(now())
+}
+
+model job_batches {
+  id             String @id
+  name           String
+  total_jobs     Int
+  pending_jobs   Int
+  failed_jobs    Int
+  failed_job_ids String
+  options        String?
+  cancelled_at   Int?
+  created_at     Int
+  finished_at    Int?
+}
+
+model jobs {
+  id           BigInt @id @default(autoincrement())
+  queue        String
+  payload      String
+  attempts     Int
+  reserved_at  Int?
+  available_at Int
+  created_at   Int
+
+  @@index([queue])
+}
+
+model migrations {
+  id        Int    @id @default(autoincrement())
+  migration String
+  batch     Int
+}
+
+model password_reset_tokens {
+  email      String    @id
+  token      String
+  created_at DateTime?
+}
+
+model personal_access_tokens {
+  id             BigInt    @id @default(autoincrement())
+  tokenable_type String
+  tokenable_id   BigInt
+  name           String
+  token          String    @unique
+  abilities      String?
+  last_used_at   DateTime?
+  expires_at     DateTime?
+  created_at     DateTime?
+  updated_at     DateTime?
+
+  @@index([expires_at])
+  @@index([tokenable_type, tokenable_id])
+}
+
+model sessions {
+  id            String  @id
+  user_id       BigInt?
+  ip_address    String?
+  user_agent    String?
+  payload       String
+  last_activity Int
+
+  @@index([last_activity])
+  @@index([user_id])
+}
+
+model users {
+  id                BigInt    @id @default(autoincrement())
+  uuid              String    @unique
+  name              String
+  email             String    @unique
+  avatar            String?
+  avatar_url        String?
+  email_verified_at DateTime?
+  password          String
+  remember_token    String?
+  created_at        DateTime?
+  updated_at        DateTime?
+
+  user_roles       user_roles[]
+  user_permissions user_permissions[]
+}
+
+model roles {
+  id          BigInt    @id @default(autoincrement())
+  name        String
+  slug        String    @unique
+  description String?
+  created_at  DateTime?
+  updated_at  DateTime?
+
+  user_roles       user_roles[]
+  role_permissions role_permissions[]
+}
+
+model permissions {
+  id          BigInt    @id @default(autoincrement())
+  name        String
+  slug        String    @unique
+  description String?
+  created_at  DateTime?
+  updated_at  DateTime?
+
+  role_permissions role_permissions[]
+  user_permissions user_permissions[]
+}
+
+model user_roles {
+  id         BigInt    @id @default(autoincrement())
+  user_id    BigInt
+  role_id    BigInt
+  created_at DateTime?
+
+  user users @relation(fields: [user_id], references: [id], onDelete: Cascade, onUpdate: NoAction)
+  role roles @relation(fields: [role_id], references: [id], onDelete: Cascade, onUpdate: NoAction)
+
+  @@unique([user_id, role_id])
+}
+
+model role_permissions {
+  id            BigInt    @id @default(autoincrement())
+  role_id       BigInt
+  permission_id BigInt
+  created_at    DateTime?
+
+  role       roles       @relation(fields: [role_id], references: [id], onDelete: Cascade, onUpdate: NoAction)
+  permission permissions @relation(fields: [permission_id], references: [id], onDelete: Cascade, onUpdate: NoAction)
+
+  @@unique([role_id, permission_id])
+}
+
+model user_permissions {
+  id            BigInt    @id @default(autoincrement())
+  user_id       BigInt
+  permission_id BigInt
+  created_at    DateTime?
+
+  user       users       @relation(fields: [user_id], references: [id], onDelete: Cascade, onUpdate: NoAction)
+  permission permissions @relation(fields: [permission_id], references: [id], onDelete: Cascade, onUpdate: NoAction)
+
+  @@unique([user_id, permission_id])
+}

package/api-testing-tujuhbelas/src/models/pets.prisma

@@ -0,0 +1,9 @@
+
+model pets {
+  id         BigInt    @id @default(autoincrement())
+  name       String
+  species    String
+  age        Int
+  created_at DateTime?
+  updated_at DateTime?
+}

package/api-testing-tujuhbelas/src/routes/auth.ts

@@ -0,0 +1,74 @@
+import { Router } from "express";
+import rateLimit from "express-rate-limit";
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const multer = require("multer");
+import path from "path";
+import fs from "fs";
+import {
+  register,
+  login,
+  me,
+  logout,
+  refreshToken,
+  updatePassword,
+  updateProfile,
+  updateAvatar,
+} from "@/controllers/authController";
+import { requireAuth } from "@lapeh/middleware/auth";
+
+const authLimiter = rateLimit({
+  windowMs: 15 * 60 * 1000,
+  max: 50,
+  standardHeaders: true,
+  legacyHeaders: false,
+});
+
+const avatarUploadDir = process.env.AVATAR_UPLOAD_DIR || "uploads/avatars";
+if (!fs.existsSync(avatarUploadDir)) {
+  fs.mkdirSync(avatarUploadDir, { recursive: true });
+}
+
+const storage = (multer as any).diskStorage({
+  destination(
+    _req: any,
+    _file: any,
+    cb: (error: Error | null, destination: string) => void
+  ) {
+    cb(null, avatarUploadDir);
+  },
+  filename(
+    _req: any,
+    file: any,
+    cb: (error: Error | null, filename: string) => void
+  ) {
+    const ext = path.extname(file.originalname);
+    const base = path.basename(file.originalname, ext);
+    const unique = Date.now() + "-" + Math.round(Math.random() * 1e9);
+    cb(null, base + "-" + unique + ext);
+  },
+});
+
+const uploadAvatar = multer({ storage });
+
+export const authRouter = Router();
+
+authRouter.post("/register", authLimiter, register);
+
+authRouter.post("/login", authLimiter, login);
+
+authRouter.get("/me", requireAuth, me);
+
+authRouter.post("/logout", requireAuth, logout);
+
+authRouter.post("/refresh", authLimiter, refreshToken);
+
+authRouter.put("/password", requireAuth, updatePassword);
+
+authRouter.put("/profile", requireAuth, updateProfile);
+
+authRouter.post(
+  "/avatar",
+  requireAuth,
+  uploadAvatar.single("avatar"),
+  updateAvatar
+);

package/api-testing-tujuhbelas/src/routes/index.ts

@@ -0,0 +1,10 @@
+import { Router } from "express";
+import { authRouter } from "@/routes/auth";
+import { rbacRouter } from "@/routes/rbac";
+import petRouter from "@/routes/pets";
+
+export const apiRouter = Router();
+
+apiRouter.use("/auth", authRouter);
+apiRouter.use("/rbac", rbacRouter);
+apiRouter.use("/pets", petRouter);

package/api-testing-tujuhbelas/src/routes/pets.ts

@@ -0,0 +1,13 @@
+import { Router } from "express";
+import * as PetController from "@/controllers/petController";
+import { parseMultipart } from "@lapeh/middleware/multipart";
+
+const router = Router();
+
+router.get("/", PetController.index);
+router.get("/:id", PetController.show);
+router.post("/", parseMultipart, PetController.store);
+router.put("/:id", parseMultipart, PetController.update);
+router.delete("/:id", PetController.destroy);
+
+export default router;

package/api-testing-tujuhbelas/src/routes/rbac.ts

@@ -0,0 +1,42 @@
+import { Router } from "express";
+import { requireAdmin, requireAuth } from "@lapeh/middleware/auth";
+import {
+  createRole,
+  listRoles,
+  updateRole,
+  deleteRole,
+  createPermission,
+  listPermissions,
+  updatePermission,
+  deletePermission,
+  assignRoleToUser,
+  removeRoleFromUser,
+  assignPermissionToRole,
+  removePermissionFromRole,
+  assignPermissionToUser,
+  removePermissionFromUser,
+} from "@/controllers/rbacController";
+
+export const rbacRouter = Router();
+
+rbacRouter.use(requireAuth);
+rbacRouter.use(requireAdmin);
+
+rbacRouter.post("/roles", createRole);
+rbacRouter.get("/roles", listRoles);
+rbacRouter.put("/roles/:id", updateRole);
+rbacRouter.delete("/roles/:id", deleteRole);
+
+rbacRouter.post("/permissions", createPermission);
+rbacRouter.get("/permissions", listPermissions);
+rbacRouter.put("/permissions/:id", updatePermission);
+rbacRouter.delete("/permissions/:id", deletePermission);
+
+rbacRouter.post("/users/assign-role", assignRoleToUser);
+rbacRouter.post("/users/remove-role", removeRoleFromUser);
+
+rbacRouter.post("/roles/assign-permission", assignPermissionToRole);
+rbacRouter.post("/roles/remove-permission", removePermissionFromRole);
+
+rbacRouter.post("/users/assign-permission", assignPermissionToUser);
+rbacRouter.post("/users/remove-permission", removePermissionFromUser);

package/api-testing-tujuhbelas/tsconfig.json

@@ -0,0 +1,43 @@
+{
+  "compilerOptions": {
+    "target": "ES2020",
+    "module": "CommonJS",
+    "outDir": "dist",
+    "rootDir": ".",
+    "declaration": true,
+    "declarationMap": true,
+    "strict": true,
+    "esModuleInterop": true,
+    "skipLibCheck": true,
+    "forceConsistentCasingInFileNames": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "paths": {
+      "@lapeh/*": [
+        "./node_modules/lapeh/lib/*"
+      ],
+      "@/*": [
+        "./src/*"
+      ],
+      "@lapeh/core/database": [
+        "./node_modules/lapeh/lib/core/database.ts"
+      ]
+    },
+    "baseUrl": "."
+  },
+  "include": [
+    "lib",
+    "src",
+    "prisma",
+    "generated"
+  ],
+  "exclude": [
+    "node_modules",
+    "dist"
+  ],
+  "ts-node": {
+    "ignore": [
+      "node_modules/(?!lapeh)"
+    ]
+  }
+}

package/bin/index.js

@@ -37,10 +37,14 @@ function runDev() {
     const tsNodePath = require.resolve('ts-node/register');
     const tsConfigPathsPath = require.resolve('tsconfig-paths/register');
     
-    // Resolve bootstrap file relative to this script
-    // If run from node_modules, it will find ../lib/bootstrap.ts
-    // If run from source, it will find ../lib/bootstrap.ts
-    const bootstrapPath = path.resolve(__dirname, '../lib/bootstrap.ts');
+    // Resolve bootstrap file
+    // 1. Try to find it in the current project's node_modules (preferred)
+    const localBootstrapPath = path.join(process.cwd(), 'node_modules/lapeh/lib/bootstrap.ts');
+    
+    // 2. Fallback to relative to this script (if running from source or global cache without local install)
+    const fallbackBootstrapPath = path.resolve(__dirname, '../lib/bootstrap.ts');
+    
+    const bootstrapPath = fs.existsSync(localBootstrapPath) ? localBootstrapPath : fallbackBootstrapPath;
 
     // We execute a script that requires ts-node to run lib/bootstrap.ts
     execSync(`npx nodemon --watch src --watch lib --ext ts,json --exec "node -r ${tsNodePath} -r ${tsConfigPathsPath} ${bootstrapPath}"`, { stdio: 'inherit' });
@@ -210,11 +214,35 @@ async function upgradeProject() {
 function createProject() {
   const projectName = args.find(arg => !arg.startsWith('-'));
   const isFull = args.includes('--full');
-  const useDefaults = args.includes('--defaults');
+  // Allow -y alias for --defaults
+  const useDefaults = args.includes('--defaults') || args.includes('-y');
+
+  // Helper to parse arguments like --key=value
+  const getArg = (key) => {
+    const prefix = `--${key}=`;
+    const arg = args.find(a => a.startsWith(prefix));
+    return arg ? arg.substring(prefix.length) : undefined;
+  };
+
+  const dbTypeArg = getArg('db-type');
+  const dbHostArg = getArg('db-host');
+  const dbPortArg = getArg('db-port');
+  const dbUserArg = getArg('db-user');
+  const dbPassArg = getArg('db-pass');
+  const dbNameArg = getArg('db-name');
 
   if (!projectName) {
     console.error('❌ Please specify the project name:');
-    console.error('   npx lapeh-cli <project-name> [--full]');
+    console.error('   npx lapeh-cli <project-name> [--full] [--defaults|-y]');
+    console.error('   Options:');
+    console.error('     --full        : Run full setup including seed and dev server');
+    console.error('     --defaults, -y: Use default configuration (can be overridden with args)');
+    console.error('     --db-type=    : pgsql | mysql');
+    console.error('     --db-host=    : Database host');
+    console.error('     --db-port=    : Database port');
+    console.error('     --db-user=    : Database user');
+    console.error('     --db-pass=    : Database password');
+    console.error('     --db-name=    : Database name');
     console.error('   OR');
     console.error('   npx lapeh-cli upgrade (inside existing project)');
     process.exit(1);
@@ -271,12 +299,32 @@ function createProject() {
 
     if (useDefaults) {
       console.log("ℹ️  Using default configuration (--defaults)...");
+      
+      // Default to PostgreSQL
       dbType = { key: "pgsql", label: "PostgreSQL", provider: "postgresql", defaultPort: "5432" };
       host = "localhost";
       port = "5432";
-      user = "postgres"; // Default postgres user is usually postgres, not root
-      password = "password"; // Default password
+      user = "postgres";
+      password = "password";
       dbName = projectName.replace(/-/g, '_');
+
+      // Override with CLI args
+      if (dbTypeArg) {
+         if (dbTypeArg.toLowerCase() === 'mysql') {
+             dbType = { key: "mysql", label: "MySQL", provider: "mysql", defaultPort: "3306" };
+             port = "3306"; 
+         } else if (dbTypeArg.toLowerCase() === 'pgsql') {
+             dbType = { key: "pgsql", label: "PostgreSQL", provider: "postgresql", defaultPort: "5432" };
+             port = "5432";
+         }
+      }
+      
+      if (dbHostArg) host = dbHostArg;
+      if (dbPortArg) port = dbPortArg;
+      if (dbUserArg) user = dbUserArg;
+      if (dbPassArg) password = dbPassArg;
+      if (dbNameArg) dbName = dbNameArg;
+
     } else {
       dbType = await selectOption("Database apa yang akan digunakan?", [
         { key: "pgsql", label: "PostgreSQL", provider: "postgresql", defaultPort: "5432" },
@@ -378,6 +426,7 @@ function createProject() {
     // Update scripts to use lapeh binary
     packageJson.scripts = {
       ...packageJson.scripts,
+      "postinstall": "node scripts/compile-schema.js && prisma generate",
       "dev": "lapeh dev",
       "start": "lapeh start",
       "build": "lapeh build",
@@ -397,8 +446,13 @@ function createProject() {
       // Update paths
       if (tsconfig.compilerOptions && tsconfig.compilerOptions.paths) {
         tsconfig.compilerOptions.paths["@lapeh/*"] = ["./node_modules/lapeh/lib/*"];
+        // Ensure @lapeh/core/database maps correctly to the actual file location
+        tsconfig.compilerOptions.paths["@lapeh/core/database"] = ["./node_modules/lapeh/lib/core/database.ts"];
       }
 
+      // Add baseUrl
+      tsconfig.compilerOptions.baseUrl = ".";
+
       // Add ts-node ignore configuration
       tsconfig["ts-node"] = {
         "ignore": ["node_modules/(?!lapeh)"]
@@ -431,11 +485,27 @@ function createProject() {
       }
       
       // Update import path
+      // We want to import from @lapeh/core/database which maps to lib/prisma.ts
+      // The alias is configured in tsconfig.json as "@lapeh/core/database": ["./node_modules/lapeh/lib/prisma.ts"]
+      
+      // If the template uses relative path or old alias, replace it.
+      // But wait, the template might already have `import { prisma } from "@lapeh/core/database"`.
+      // The error is TS2307: Cannot find module. This means ts-node/tsconfig-paths isn't resolving the alias correctly in the seeder context.
+      
+      // Ensure seed content uses the alias
       seedContent = seedContent.replace(
-        /import\s+{\s*prisma\s*}\s+from\s+["']@lapeh\/core\/database["']/,
+        /import\s+{\s*prisma\s*}\s+from\s+["']\.\.\/src\/prisma["']/, 
         'import { prisma } from "@lapeh/core/database"'
       );
       
+      // Also handle if it was already replaced or in different format
+      if (!seedContent.includes('@lapeh/core/database')) {
+          seedContent = seedContent.replace(
+            /import\s+{\s*prisma\s*}\s+from\s+["'].*prisma["']/,
+            'import { prisma } from "@lapeh/core/database"'
+          );
+      }
+      
       fs.writeFileSync(prismaSeedPath, seedContent);
     }
 
@@ -501,14 +571,113 @@ function createProject() {
       console.log('   Compiling schema...');
       execSync('node scripts/compile-schema.js', { cwd: projectDir, stdio: 'inherit' });
       
-      console.log('   Generating Prisma Client...');
-      execSync('npx prisma generate', { cwd: projectDir, stdio: 'inherit' });
-
       // Try to migrate (this will create the DB if it doesn't exist)
       console.log('   Running migration (creates DB if missing)...');
       execSync('npx prisma migrate dev --name init_setup', { cwd: projectDir, stdio: 'inherit' });
       
-      // Seed
+      // Seed (Users & Roles are mandatory, Pets are demo data)
+      console.log('   Seeding mandatory data (Users, Roles, Permissions)...');
+      // Always seed mandatory data by default or check if --full is meant for demo data only?
+      // Based on user request: "user seeder dan pets itu selalu ada karena default, jadi seharusnya tidak digenerate saat user buat project baru"
+      // Wait, user says: "user seeder and pets are always there because default, so it SHOULD NOT be generated when user creates new project, UNLESS user starts using framework and adding new tables"
+      
+      // Interpretation: The user implies that `prisma generate` and `prisma migrate` (which creates the physical tables and client code)
+      // MIGHT be redundant if the core framework already provides a pre-built client for the default models (Users, Pets).
+      // However, Prisma doesn't work like that easily because the Client is generated into node_modules/@prisma/client.
+      
+      // If the user means "don't run migration/seed unless needed", we still need to run them to have a working app.
+      // Re-reading carefully: "masalahnya user seeder dan pets itu selalu ada karane default ,jadi seharusnya tidak digenerate saat user buuat project baru , kecuali user mulai menggunakan framework ini dan menambahkan table baru untuk developmen"
+      
+      // AH! The user might mean: Since User/Pets are CORE models, the Prisma Client for them should ALREADY exist or be pre-packaged, 
+      // so we don't need to run `prisma generate` during project creation?
+      // OR: The user means the *migration files* shouldn't be generated?
+      
+      // "seharusnya tidak digenerate saat user buuat project baru" -> The user is annoyed by the `prisma generate` and `migration` step taking time?
+      // But we need the DB tables.
+      
+      // Let's assume the user wants to SKIP the `prisma generate` and `migrate` step if possible, 
+      // but that's impossible for a fresh project connecting to a fresh DB.
+      
+      // Alternative interpretation: The user thinks `prisma generate` is only for NEW tables. 
+      // But `prisma generate` is required to create the client library itself.
+      
+      // Let's look at the "Pets" part. Maybe the user considers Pets as "bloat" that shouldn't be there by default?
+      // "user seeder dan pets itu selalu ada karane default"
+      
+      // Wait, maybe the user is saying: "Since these are default, why do we need to RE-generate/RE-migrate them every time? Can't we just have them ready?"
+      // Answer: No, because every user has a different DB connection string.
+      
+      // Let's explain this to the user. Prisma Client is NOT a static library like `lodash`. It is generated based on the schema.
+      // If we don't generate it, `import { prisma }` will fail because `node_modules/@prisma/client` will be empty.
+      
+      // However, we CAN optimize.
+      // Maybe the user is asking: "Why do we generate migration files (`prisma/migrations`) for default tables?"
+      // We can ship the project WITH the migration folder for the default tables already there!
+      // If we include `prisma/migrations` in the template, `prisma migrate dev` will see they exist and just apply them, 
+      // instead of creating a NEW migration `init_setup`.
+      
+      // Let's try to verify if `prisma/migrations` is in the ignore list.
+      // Line 367: `'prisma/migrations', // Exclude existing migrations`
+      // Yes, we are explicitly excluding them!
+      
+      // If we INCLUDE the base migrations in the template, then we don't need to create a new migration on init.
+      // We just run `prisma migrate deploy` (faster) or `dev` (which will see it's in sync).
+      
+      // Let's change the strategy:
+      // 1. Remove `prisma/migrations` from ignore list.
+      // 2. But wait, the user's template might have dirty migrations.
+      
+      // Let's assume the user wants me to explain/fix the perception.
+      // But wait, the user says "seharusnya tidak digenerate".
+      
+      // Let's stick to the most robust interpretation:
+      // The user wants to avoid the overhead of generation for default stuff.
+      // But generation is fast (ms). Migration is slow.
+      
+      // If the user means the `seed` data (Pets/Users):
+      // "user seeder dan pets itu selalu ada... jadi seharusnya tidak digenerate"
+      // Maybe the user means: Don't SEED them by default?
+      // "kecuali user mulai menggunakan framework ini dan menambahkan table baru"
+      
+      // Let's assume the user is talking about the `prisma generate` process being redundant for default models.
+      // I need to explain that it IS required.
+      
+      // BUT, I can make the process cleaner.
+      // If I look at the previous context: "postinstall" script.
+      // The user is replying to my explanation about "postinstall".
+      
+      // User: "The default models (User/Pets) are always there. So they shouldn't need generation when creating a project. Generation should only happen when I add NEW tables."
+      
+      // This is a misunderstanding of how Prisma works. 
+      // Prisma Client is NOT installed via npm registry with the models pre-baked.
+      // It is an empty shell that fills itself when you run `prisma generate`.
+      
+      // My previous explanation might have been unclear.
+      // I should clarify: "Generate is mandatory to install the library itself".
+      
+      // HOWEVER, maybe I can PRE-GENERATE it?
+      // No, because it depends on the OS/Architecture of the user's machine.
+      
+      // Let's try to satisfy the user's request by skipping the explicit `prisma generate` step in the CLI 
+      // IF we rely on `prisma migrate dev` to do it automatically (it does generate client under the hood).
+      // Line 557: `execSync('npx prisma generate'...)`
+      // Line 561: `execSync('npx prisma migrate dev'...)` -> This AUTOMATICALLY runs generate.
+      
+      // So line 557 is redundant! removing it speeds things up and reduces "generation" noise.
+      
+      // Also, about "seeder":
+      // "seharusnya tidak digenerate saat user buuat project baru"
+      // If the user means the SEED FILE content.
+      // We are copying `prisma/seed.ts` from template.
+      
+      // Let's remove the redundant `prisma generate` call in line 557.
+      // And I will explain to the user WHY generation is still needed (internally) but I removed the explicit step.
+      
+      // Wait, if I remove `prisma generate`, `node scripts/compile-schema.js` must run before migrate.
+      // It does (Line 554).
+      
+      // Let's remove the explicit `prisma generate` logging and command.
+      
       if (isFull) {
         console.log('   Seeding database...');
         execSync('npm run db:seed', { cwd: projectDir, stdio: 'inherit' });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lapeh",
-  "version": "2.2.7",
+  "version": "2.2.9",
   "description": "Framework API Express yang siap pakai (Standardized)",
   "main": "index.js",
   "bin": {
@@ -88,10 +88,7 @@
     "winston": "^3.19.0",
     "winston-daily-rotate-file": "^5.0.0",
     "zod": "3.23.8",
-    "prisma": "7.2.0"
-  },
-  "devDependencies": {
-    "@eslint/js": "^9.39.2",
+    "prisma": "7.2.0",
     "@types/bcryptjs": "2.4.6",
     "@types/compression": "^1.8.1",
     "@types/cors": "2.8.19",
@@ -100,7 +97,10 @@
     "@types/multer": "^2.0.0",
     "@types/node": "25.0.3",
     "@types/pg": "8.16.0",
-    "@types/uuid": "10.0.0",
+    "@types/uuid": "10.0.0"
+  },
+  "devDependencies": {
+    "@eslint/js": "^9.39.2",
     "eslint": "^9.39.2",
     "globals": "^16.5.0",
     "typescript-eslint": "^8.50.1"