lapeh 2.2.6 → 2.2.8

package/bin/index.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 
 const fs = require('fs');
 const path = require('path');
@@ -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' });
@@ -183,7 +187,7 @@ async function upgradeProject() {
     
     // Update paths
     if (tsconfig.compilerOptions && tsconfig.compilerOptions.paths) {
-      tsconfig.compilerOptions.paths["@lapeh/*"] = ["node_modules/lapeh/lib/*"];
+      tsconfig.compilerOptions.paths["@lapeh/*"] = ["./node_modules/lapeh/lib/*"];
     }
 
     // Add ts-node ignore configuration
@@ -210,10 +214,35 @@ async function upgradeProject() {
 function createProject() {
   const projectName = args.find(arg => !arg.startsWith('-'));
   const isFull = args.includes('--full');
+  // 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);
@@ -266,27 +295,65 @@ 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)...");
+      
+      // Default to PostgreSQL
+      dbType = { key: "pgsql", label: "PostgreSQL", provider: "postgresql", defaultPort: "5432" };
+      host = "localhost";
+      port = "5432";
+      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" },
+        { 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 = [
@@ -346,6 +413,10 @@ function createProject() {
     // 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';
@@ -355,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",
@@ -373,9 +445,12 @@ function createProject() {
       
       // Update paths
       if (tsconfig.compilerOptions && tsconfig.compilerOptions.paths) {
-        tsconfig.compilerOptions.paths["@lapeh/*"] = ["node_modules/lapeh/lib/*"];
+        tsconfig.compilerOptions.paths["@lapeh/*"] = ["./node_modules/lapeh/lib/*"];
       }
 
+      // Add baseUrl
+      tsconfig.compilerOptions.baseUrl = ".";
+
       // Add ts-node ignore configuration
       tsconfig["ts-node"] = {
         "ignore": ["node_modules/(?!lapeh)"]
@@ -384,6 +459,38 @@ function createProject() {
       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');
@@ -446,14 +553,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.6",
+  "version": "2.2.8",
   "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"