lapeh 2.2.5 → 2.2.7

package/api-testing-sepuluh/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-sepuluh/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-sepuluh/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-sepuluh/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-sepuluh/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-sepuluh/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-sepuluh/tsconfig.json

@@ -0,0 +1,39 @@
+{
+  "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/*"
+      ]
+    }
+  },
+  "include": [
+    "lib",
+    "src",
+    "prisma",
+    "generated"
+  ],
+  "exclude": [
+    "node_modules",
+    "dist"
+  ],
+  "ts-node": {
+    "ignore": [
+      "node_modules/(?!lapeh)"
+    ]
+  }
+}

package/bin/index.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 
 const fs = require('fs');
 const path = require('path');
@@ -36,9 +36,14 @@ function runDev() {
   try {
     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');
+
     // We execute a script that requires ts-node to run lib/bootstrap.ts
-    // In a real package, this would be `node dist/lib/bootstrap.js`
-    execSync(`npx nodemon --exec "node -r ${tsNodePath} -r ${tsConfigPathsPath}" -e "require('./lib/bootstrap').bootstrap()"`, { stdio: 'inherit' });
+    execSync(`npx nodemon --watch src --watch lib --ext ts,json --exec "node -r ${tsNodePath} -r ${tsConfigPathsPath} ${bootstrapPath}"`, { stdio: 'inherit' });
   } catch (error) {
     // Ignore error
   }
@@ -77,6 +82,8 @@ async function upgradeProject() {
 
   // Files/Folders to overwrite/copy
   const filesToSync = [
+    'bin', // Ensure CLI script is updated
+    'lib', // Ensure core framework files are updated
     'scripts',
     'docker-compose.yml',
     '.env.example',
@@ -141,7 +148,11 @@ async function upgradeProject() {
   // Update scripts
   currentPackageJson.scripts = {
     ...currentPackageJson.scripts,
-    ...templatePackageJson.scripts
+    ...templatePackageJson.scripts,
+    "dev": "lapeh dev",
+    "start": "lapeh start",
+    "build": "lapeh build",
+    "start:prod": "lapeh start"
   };
 
   // Update dependencies
@@ -157,10 +168,32 @@ async function upgradeProject() {
   };
 
   // Update Lapeh version tag
-  currentPackageJson.dependencies["lapeh"] = templatePackageJson.version;
+  // For local development, we use file reference. For production publish, use version.
+  currentPackageJson.dependencies["lapeh"] = "file:../"; 
 
   fs.writeFileSync(packageJsonPath, JSON.stringify(currentPackageJson, null, 2));
 
+  // Update tsconfig.json to support framework-as-dependency
+  console.log('🔧 Configuring tsconfig.json...');
+  const tsconfigPath = path.join(currentDir, 'tsconfig.json');
+  if (fs.existsSync(tsconfigPath)) {
+    // Use comment-json or just basic parsing if no comments (standard JSON)
+    // Since our template tsconfig is standard JSON, require is fine or JSON.parse
+    const tsconfig = require(tsconfigPath);
+    
+    // Update paths
+    if (tsconfig.compilerOptions && tsconfig.compilerOptions.paths) {
+      tsconfig.compilerOptions.paths["@lapeh/*"] = ["./node_modules/lapeh/lib/*"];
+    }
+
+    // Add ts-node ignore configuration
+    tsconfig["ts-node"] = {
+      "ignore": ["node_modules/(?!lapeh)"]
+    };
+
+    fs.writeFileSync(tsconfigPath, JSON.stringify(tsconfig, null, 2));
+  }
+
   // Run npm install
   console.log('📦 Installing updated dependencies...');
   try {
@@ -177,6 +210,7 @@ async function upgradeProject() {
 function createProject() {
   const projectName = args.find(arg => !arg.startsWith('-'));
   const isFull = args.includes('--full');
+  const useDefaults = args.includes('--defaults');
 
   if (!projectName) {
     console.error('❌ Please specify the project name:');
@@ -233,27 +267,45 @@ function createProject() {
 
     // --- DATABASE SELECTION ---
     console.log("\n--- Database Configuration ---");
-    const dbType = await selectOption("Database apa yang akan digunakan?", [
-      { key: "pgsql", label: "PostgreSQL", provider: "postgresql", defaultPort: "5432" },
-      { key: "mysql", label: "MySQL", provider: "mysql", defaultPort: "3306" },
-    ]);
+    let dbType, host, port, user, password, dbName;
+
+    if (useDefaults) {
+      console.log("ℹ️  Using default configuration (--defaults)...");
+      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
+      dbName = projectName.replace(/-/g, '_');
+    } else {
+      dbType = await selectOption("Database apa yang akan digunakan?", [
+        { key: "pgsql", label: "PostgreSQL", provider: "postgresql", defaultPort: "5432" },
+        { key: "mysql", label: "MySQL", provider: "mysql", defaultPort: "3306" },
+      ]);
+
+      host = await ask("Database Host", "localhost");
+      port = await ask("Database Port", dbType.defaultPort);
+      user = await ask("Database User", "root");
+      password = await ask("Database Password", "");
+      dbName = await ask("Database Name", projectName.replace(/-/g, '_')); // Default db name based on project name
+    }
 
     let dbUrl = "";
     let dbProvider = dbType.provider;
 
-    const host = await ask("Database Host", "localhost");
-    const port = await ask("Database Port", dbType.defaultPort);
-    const user = await ask("Database User", "root");
-    const password = await ask("Database Password", "");
-    const dbName = await ask("Database Name", projectName.replace(/-/g, '_')); // Default db name based on project name
-
     if (dbType.key === "pgsql") {
       dbUrl = `postgresql://${user}:${password}@${host}:${port}/${dbName}?schema=public`;
     } else {
       dbUrl = `mysql://${user}:${password}@${host}:${port}/${dbName}`;
     }
 
-    rl.close();
+    if (!useDefaults) {
+      rl.close();
+    } else {
+      // If we didn't use rl, we might not need to close it if we didn't open it? 
+      // Actually rl is created at the top. We should close it.
+      rl.close();
+    }
 
     // List of files/folders to exclude
     const ignoreList = [
@@ -261,7 +313,8 @@ function createProject() {
       'dist',
       '.git',
       '.env',
-      'bin', // Don't copy the CLI script itself
+      'bin', // Exclude bin folder, using dependency instead
+      'lib', // Exclude lib folder, using dependency instead
       'package-lock.json',
       '.DS_Store',
       'prisma/migrations', // Exclude existing migrations
@@ -306,15 +359,86 @@ function createProject() {
     packageJson.name = projectName;
     // Add lapeh framework version to dependencies to track it like react-router
     packageJson.dependencies = packageJson.dependencies || {};
-    packageJson.dependencies["lapeh"] = packageJson.version; 
+    // For local development, we use file reference. For production publish, use version.
+    packageJson.dependencies["lapeh"] = "file:../"; 
+    
+    // Ensure prisma CLI is available in devDependencies for the new project
+    packageJson.devDependencies = packageJson.devDependencies || {};
+    packageJson.devDependencies["prisma"] = "7.2.0";
     
+    // Add missing types for dev
+    packageJson.devDependencies["@types/express"] = "^5.0.0";
+    packageJson.devDependencies["@types/compression"] = "^1.7.5";
+
     packageJson.version = '1.0.0';
     packageJson.description = 'Generated by lapeh';
     delete packageJson.bin; // Remove the bin entry from the generated project
     delete packageJson.repository; // Remove repository info if specific to the template
 
+    // Update scripts to use lapeh binary
+    packageJson.scripts = {
+      ...packageJson.scripts,
+      "dev": "lapeh dev",
+      "start": "lapeh start",
+      "build": "lapeh build",
+      "start:prod": "lapeh start"
+    };
+
     fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2));
 
+    // Update tsconfig.json to support framework-as-dependency
+    console.log('🔧 Configuring tsconfig.json...');
+    const tsconfigPath = path.join(projectDir, 'tsconfig.json');
+    if (fs.existsSync(tsconfigPath)) {
+      // Use comment-json or just basic parsing if no comments (standard JSON)
+      // Since our template tsconfig is standard JSON, require is fine or JSON.parse
+      const tsconfig = require(tsconfigPath);
+      
+      // Update paths
+      if (tsconfig.compilerOptions && tsconfig.compilerOptions.paths) {
+        tsconfig.compilerOptions.paths["@lapeh/*"] = ["./node_modules/lapeh/lib/*"];
+      }
+
+      // Add ts-node ignore configuration
+      tsconfig["ts-node"] = {
+        "ignore": ["node_modules/(?!lapeh)"]
+      };
+
+      fs.writeFileSync(tsconfigPath, JSON.stringify(tsconfig, null, 2));
+    }
+
+    // Configure prisma.config.ts to use tsconfig-paths
+    const prismaConfigPath = path.join(projectDir, 'prisma.config.ts');
+    if (fs.existsSync(prismaConfigPath)) {
+      console.log('🔧 Configuring prisma.config.ts...');
+      let prismaConfigContent = fs.readFileSync(prismaConfigPath, 'utf8');
+      prismaConfigContent = prismaConfigContent.replace(
+        /seed:\s*"ts-node\s+prisma\/seed\.ts"/g,
+        'seed: "ts-node -r tsconfig-paths/register prisma/seed.ts"'
+      );
+      fs.writeFileSync(prismaConfigPath, prismaConfigContent);
+    }
+    
+    // Configure prisma/seed.ts imports
+    const prismaSeedPath = path.join(projectDir, 'prisma', 'seed.ts');
+    if (fs.existsSync(prismaSeedPath)) {
+      console.log('🔧 Configuring prisma/seed.ts...');
+      let seedContent = fs.readFileSync(prismaSeedPath, 'utf8');
+      
+      // Add dotenv config if missing
+      if (!seedContent.includes('dotenv.config()')) {
+        seedContent = 'import dotenv from "dotenv";\ndotenv.config();\n\n' + seedContent;
+      }
+      
+      // Update import path
+      seedContent = seedContent.replace(
+        /import\s+{\s*prisma\s*}\s+from\s+["']@lapeh\/core\/database["']/,
+        'import { prisma } from "@lapeh/core/database"'
+      );
+      
+      fs.writeFileSync(prismaSeedPath, seedContent);
+    }
+
     // Create .env from .env.example with correct DB config
     console.log('⚙️  Configuring environment...');
     const envExamplePath = path.join(projectDir, '.env.example');

package/lib/bootstrap.ts

@@ -143,3 +143,8 @@ export async function bootstrap() {
     shutdown("uncaughtException");
   });
 }
+
+// Self-executing if run directly
+if (require.main === module) {
+  bootstrap();
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lapeh",
-  "version": "2.2.5",
+  "version": "2.2.7",
   "description": "Framework API Express yang siap pakai (Standardized)",
   "main": "index.js",
   "bin": {
@@ -87,7 +87,8 @@
     "uuid": "13.0.0",
     "winston": "^3.19.0",
     "winston-daily-rotate-file": "^5.0.0",
-    "zod": "3.23.8"
+    "zod": "3.23.8",
+    "prisma": "7.2.0"
   },
   "devDependencies": {
     "@eslint/js": "^9.39.2",

package/prisma/seed.ts

@@ -1,4 +1,7 @@
-import { prisma } from "../lib/core/database";
+import dotenv from "dotenv";
+dotenv.config();
+
+import { prisma } from "@lapeh/core/database";
 import bcrypt from "bcryptjs";
 import { v4 as uuidv4 } from "uuid";
 

package/prisma.config.ts

@@ -7,7 +7,7 @@ export default defineConfig({
   schema: "prisma/schema.prisma",
   migrations: {
     path: "prisma/migrations",
-    seed: "ts-node prisma/seed.ts",
+    seed: "ts-node -r tsconfig-paths/register prisma/seed.ts",
   },
   datasource: {
     url: env("DATABASE_URL"),