lapeh 2.3.4 → 2.3.6

package/bin/index.js

@@ -54,7 +54,19 @@ function runDev() {
     // The path contains spaces "TESTING LAPEH". When passed to `exec`, it might be splitting.
     // We should quote the paths properly.
 
-    const cmd = `npx nodemon --watch src --watch lib --ext ts,json --exec "node -r \\"${tsNodePath}\\" -r \\"${tsConfigPathsPath}\\" \\"${bootstrapPath}\\""`;
+    // Windows paths with spaces are tricky. 
+    // We need to use slightly different quoting strategy or use spawn instead of execSync for better argument handling.
+    // However, execSync is simpler for now.
+    
+    // Using simple double quotes around the whole argument for node -r might work better if we escape backslashes?
+    // Or just ensure paths are quoted.
+    
+    // Let's try to escape backslashes in paths for the string interpolation
+    const safeTsNodePath = tsNodePath.replace(/\\/g, '\\\\');
+    const safeTsConfigPathsPath = tsConfigPathsPath.replace(/\\/g, '\\\\');
+    const safeBootstrapPath = bootstrapPath.replace(/\\/g, '\\\\');
+
+    const cmd = `npx nodemon --watch src --watch lib --ext ts,json --exec "node -r \\"${safeTsNodePath}\\" -r \\"${safeTsConfigPathsPath}\\" \\"${safeBootstrapPath}\\""`;
     
     execSync(cmd, { stdio: 'inherit' });
   } catch (error) {
@@ -110,9 +122,34 @@ function runStart() {
      // But `runStart` is inside `bin/index.js` which is likely a JS file.
      // We can require('../lib/bootstrap') or '../dist/lib/bootstrap'.
      
-     const frameworkBootstrap = require('../lib/bootstrap');
-     frameworkBootstrap.bootstrap();
-     return; // Exit this function, let the bootstrap take over
+     // IMPORTANT: When running from a user's project, the 'lapeh' package is inside node_modules.
+     // So `__dirname` is `.../node_modules/lapeh/bin`.
+     // We want `.../node_modules/lapeh/lib/bootstrap.js`.
+     
+     let frameworkBootstrap;
+     try {
+        frameworkBootstrap = require('../lib/bootstrap');
+     } catch (e) {
+        try {
+            frameworkBootstrap = require('../dist/lib/bootstrap');
+        } catch (e2) {
+             // Try absolute path resolution from CWD if relative require fails
+             // This handles cases where CLI might be symlinked or global
+             const cwdNodeModules = path.join(process.cwd(), 'node_modules', 'lapeh');
+             if (fs.existsSync(path.join(cwdNodeModules, 'lib/bootstrap.js'))) {
+                 frameworkBootstrap = require(path.join(cwdNodeModules, 'lib/bootstrap.js'));
+             } else if (fs.existsSync(path.join(cwdNodeModules, 'dist/lib/bootstrap.js'))) {
+                 frameworkBootstrap = require(path.join(cwdNodeModules, 'dist/lib/bootstrap.js'));
+             } else {
+                 throw e;
+             }
+        }
+     }
+     
+     if (frameworkBootstrap) {
+        frameworkBootstrap.bootstrap();
+        return; // Exit this function, let the bootstrap take over
+     }
      
   } catch (e) {
       // If direct require fails (maybe because of ESM/CJS mix or path issues), fallback to child process
@@ -132,7 +169,8 @@ function runStart() {
   const possiblePaths = [
       path.join(__dirname, '../lib/bootstrap.js'),
       path.join(__dirname, '../dist/lib/bootstrap.js'),
-      path.join(process.cwd(), 'node_modules/lapeh/lib/bootstrap.js')
+      path.join(process.cwd(), 'node_modules/lapeh/lib/bootstrap.js'),
+      path.join(process.cwd(), 'node_modules/lapeh/dist/lib/bootstrap.js')
   ];
   
   bootstrapPath = possiblePaths.find(p => fs.existsSync(p));
@@ -143,7 +181,9 @@ function runStart() {
       process.exit(1);
   }
 
-  const cmd = `node -e "require('${bootstrapPath.replace(/\\/g, '/')}').bootstrap()"`;
+  // Escape backslashes for Windows paths in the require string
+  const safeBootstrapPath = bootstrapPath.replace(/\\/g, '/'); // node require uses forward slashes or escaped backslashes
+  const cmd = `node -e "require('${safeBootstrapPath}').bootstrap()"`;
   execSync(cmd, { 
     stdio: 'inherit',
     env: { ...process.env, NODE_ENV: 'production' }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lapeh",
-  "version": "2.3.4",
+  "version": "2.3.6",
   "description": "Framework API Express yang siap pakai (Standardized)",
   "main": "index.js",
   "bin": {