lapeh 2.2.5 → 2.2.6

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 {
@@ -261,7 +294,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 +340,50 @@ 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";
+
     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));
+    }
+
     // 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.6",
   "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"),