frontend-hamroun 1.2.17 → 1.2.18

package/bin/cli.js

@@ -397,275 +397,293 @@ async function generateApiRoute(name, directory) {
           const serverDeps = {
             "express": "^4.18.2",
             "cors": "^2.8.5",
-          };"mongodb": "^5.7.0",     // Add MongoDB support
+            "mongodb": "^5.7.0",     // Add MongoDB support
             "jsonwebtoken": "^9.0.2", // Add JWT support for auth
-          const devDeps = {.4.3"     // Add password hashing support
-            "@types/express": "^4.17.17",
-            "@types/cors": "^2.8.13"
-          };nst devDeps = {
+            "bcryptjs": "^2.4.3"     // Add password hashing support
+          };
+          
+          const devDeps = {
             "@types/express": "^4.17.17",
+            "@types/cors": "^2.8.13",
+            "@types/mongodb": "^4.0.7",
+            "@types/jsonwebtoken": "^9.0.3",
+            "@types/bcryptjs": "^2.4.4"
+          };
+          
           // Add dependencies if needed
           pkg.dependencies = pkg.dependencies || {};
           for (const [dep, version] of Object.entries(serverDeps)) {
             if (!pkg.dependencies[dep]) {
               pkg.dependencies[dep] = version;
               needsUpdate = true;
-            }Add dependencies if needed
-          }kg.dependencies = pkg.dependencies || {};
-          for (const [dep, version] of Object.entries(serverDeps)) {
+            }
+          }
+          
           // Add dev dependencies if needed
           pkg.devDependencies = pkg.devDependencies || {};
           for (const [dep, version] of Object.entries(devDeps)) {
             if (!pkg.devDependencies[dep]) {
               pkg.devDependencies[dep] = version;
               needsUpdate = true;
-            }Add dev dependencies if needed
-          }kg.devDependencies = pkg.devDependencies || {};
-          for (const [dep, version] of Object.entries(devDeps)) {
+            }
+          }
+          
           // Add start script if it doesn't exist
-          pkg.scripts = pkg.scripts || {};ersion;
+          pkg.scripts = pkg.scripts || {};
           if (!pkg.scripts.start) {
             pkg.scripts.start = "node server.js";
             needsUpdate = true;
           }
-          // Add start script if it doesn't exist
-          // Save changes if needed || {};
-          if (needsUpdate) {tart) {
+          
+          // Save changes if needed
+          if (needsUpdate) {
             await fs.writeJson(pkgPath, pkg, { spaces: 2 });
             console.log(chalk.green('Updated package.json with server dependencies'));
           }
         } 
-      } catch (error) {es if needed
+      } catch (error) {
         console.warn(chalk.yellow('Could not update package.json:', error.message));
-      }     await fs.writeJson(pkgPath, pkg, { spaces: 2 });
-    }       console.log(chalk.green('Updated package.json with server dependencies'));
-          }
+      }
+    }
+    
     spinner.success({ text: `API route ${chalk.green(name)} generated successfully!` });
-      } catch (error) {
-    console.log('\nFile created:');Could not update package.json:', error.message));
+    
+    console.log('\nFile created:');
     console.log(chalk.cyan(`  ${path.join(directory, routePath)}.ts`));
-    }
+    
   } catch (error) {
-    spinner.error({ text: 'Failed to generate API route' });generated successfully!` });
+    spinner.error({ text: 'Failed to generate API route' });
     console.error(chalk.red(error));
-    process.exit(1);ile created:');
-  } console.log(chalk.cyan(`  ${path.join(directory, routePath)}.ts`));
-}   
-  } catch (error) {
-// Add a server template for Express generate API route' });
-const SERVER_TEMPLATE = `import { server } from 'frontend-hamroun';
     process.exit(1);
+  }
+}
+
+// Add a server template for Express
+const SERVER_TEMPLATE = `import { server } from 'frontend-hamroun';
+
 async function startServer() {
   try {
     // Dynamically import server module
     const { Server } = await server.getServer();
-    t SERVER_TEMPLATE = `import { server } from 'frontend-hamroun';
+    
     // Create and configure the server
-    const app = new Server({ {
+    const app = new Server({
       port: process.env.PORT ? parseInt(process.env.PORT) : 3000,
-      apiDir: './api',ort server module
-      staticDir: './public', server.getServer();
+      apiDir: './api',
+      staticDir: './public',
       
-      // Enable CORSr
-      enableCors: true,t app = new Server({
-      corsOptions: { process.env.PORT ? parseInt(process.env.PORT) : 3000,
+      // Enable CORS
+      enableCors: true,
+      corsOptions: {
         origin: process.env.CORS_ORIGIN || '*', // Set to specific domain in production
-        methods: ['GET', 'POST', 'PUT', 'DELETE', 'PATCH'],lic',
+        methods: ['GET', 'POST', 'PUT', 'DELETE', 'PATCH'],
         allowedHeaders: ['Content-Type', 'Authorization']
-      }, Uncomment to enable database
+      },
+      
+      // Uncomment to enable database
       /*
-      // Uncomment to enable database (choose one)
-      /*url: process.env.DATABASE_URL || 'mongodb://localhost:27017/my_app',
-      db: { 'mongodb'
+      db: {
         // MongoDB
         url: process.env.MONGODB_URL || 'mongodb://localhost:27017/my_app',
         type: 'mongodb'
-         Uncomment to enable authentication
-        // MySQL*
-        // url: process.env.MYSQL_URL || 'mysql://user:password@localhost:3306/my_db',  auth: {
-        // type: 'mysql'.env.JWT_SECRET || 'your-secret-key',
-        '
-        // PostgreSQL  }
+        
+        // MySQL
+        // url: process.env.MYSQL_URL || 'mysql://user:password@localhost:3306/my_db',
+        // type: 'mysql'
+        
+        // PostgreSQL
         // url: process.env.POSTGRES_URL || 'postgres://user:password@localhost:5432/my_db',
         // type: 'postgres'
       },
       */
       
       // Uncomment to enable authentication
-      /* running at http://localhost:' + 
-      auth: {T || 3000));
+      /*
+      auth: {
         secret: process.env.JWT_SECRET || 'your-secret-key',
-        expiresIn: '7d'ful shutdown
+        expiresIn: '7d'
       }
-      */hutting down server...');
-    });   await app.stop();
-         process.exit(0);
-    // Connect to database if configured    });
-    if (app.getDatabase()) {or) {
-      await app.getDatabase().connect();  console.error('Failed to start server:', error);
-      console.log('Connected to database');    process.exit(1);
+      */
+    });
+    
+    // Connect to database if configured
+    if (app.getDatabase()) {
+      await app.getDatabase().connect();
+      console.log('Connected to database');
     }
     
     // Start the server
-    await app.start();rver();
+    await app.start();
     
     console.log('Server running at http://localhost:' + 
-      (process.env.PORT || 3000));c function addDockerfile(isSSR) {
-      ockerfile...').start();
+      (process.env.PORT || 3000));
+    
     // Handle graceful shutdown
     process.on('SIGINT', async () => {
-      console.log('Shutting down server...');PLATE : DOCKERFILE_TEMPLATE;
-      if (app.getDatabase()) {ath.join(process.cwd(), 'Dockerfile');
+      console.log('Shutting down server...');
+      if (app.getDatabase()) {
         await app.getDatabase().disconnect();
         console.log('Database connection closed');
-      }xists(targetPath)) {
-      await app.stop();ner.stop();
-      console.log('Server stopped');const { overwrite } = await inquirer.prompt([{
-      process.exit(0);,
+      }
+      await app.stop();
+      console.log('Server stopped');
+      process.exit(0);
     });
-  } catch (error) {: 'Dockerfile already exists. Overwrite?',
-    console.error('Failed to start server:', error); default: false
-    process.exit(1);}]);
+  } catch (error) {
+    console.error('Failed to start server:', error);
+    process.exit(1);
   }
-} if (!overwrite) {
-    console.log(chalk.yellow('Operation cancelled.'));
+}
+
 startServer();
 `;
-  
+
 async function addDockerfile(isSSR) {
-  const spinner = createSpinner('Adding Dockerfile...').start();}
+  const spinner = createSpinner('Adding Dockerfile...').start();
   
   try {
     const dockerContent = isSSR ? SSR_DOCKERFILE_TEMPLATE : DOCKERFILE_TEMPLATE;
     const targetPath = path.join(process.cwd(), 'Dockerfile');
-    ({ text: 'Dockerfile added successfully!' });
+    
     // Check if Dockerfile already exists
-    if (await fs.pathExists(targetPath)) {Docker image:');
-      spinner.stop();k.cyan('  docker build -t my-app .'));
-      const { overwrite } = await inquirer.prompt([{ console.log(chalk.cyan('  docker run -p 3000:' + (isSSR ? '3000' : '80') + ' my-app'));
-        type: 'confirm',   
-        name: 'overwrite',  } catch (error) {
-        message: 'Dockerfile already exists. Overwrite?','Failed to add Dockerfile' });
+    if (await fs.pathExists(targetPath)) {
+      spinner.stop();
+      const { overwrite } = await inquirer.prompt([{
+        type: 'confirm',
+        name: 'overwrite',
+        message: 'Dockerfile already exists. Overwrite?',
         default: false
-      }]);    process.exit(1);
+      }]);
       
       if (!overwrite) {
         console.log(chalk.yellow('Operation cancelled.'));
-        return;lates
-      }quest, Response } from 'express';
+        return;
+      }
       
-      spinner.start();port const get = (req: Request, res: Response) => {
-    }  res.json({
+      spinner.start();
+    }
     
-    // Write Dockerfileeq.query,
+    // Write Dockerfile
     await fs.writeFile(targetPath, dockerContent);
     
     spinner.success({ text: 'Dockerfile added successfully!' });
     
-    console.log('\nTo build and run Docker image:');port const post = (req: Request, res: Response) => {
-    console.log(chalk.cyan('  docker build -t my-app .'));  res.json({
+    console.log('\nTo build and run Docker image:');
+    console.log(chalk.cyan('  docker build -t my-app .'));
     console.log(chalk.cyan('  docker run -p 3000:' + (isSSR ? '3000' : '80') + ' my-app'));
-    q.body,
-  } catch (error) {)
+    
+  } catch (error) {
     spinner.error({ text: 'Failed to add Dockerfile' });
     console.error(chalk.red(error));
     process.exit(1);
-  }port const put = (req: Request, res: Response) => {
-}  res.json({
+  }
+}
 
-// Add API route templatesq.body,
+// Add API route templates
 const API_ROUTE_TEMPLATE = `import { Request, Response } from 'express';
 
 export const get = (req: Request, res: Response) => {
   res.json({
-    message: 'This is a GET endpoint',export const delete_ = (req: Request, res: Response) => {
+    message: 'This is a GET endpoint',
     query: req.query,
-    timestamp: new Date().toISOString()ETE endpoint',
-  });().toISOString()
+    timestamp: new Date().toISOString()
+  });
 };
 
 export const post = (req: Request, res: Response) => {
-  res.json({You can add middleware that will be applied to all methods
-    message: 'This is a POST endpoint',port const middleware = [
-    body: req.body,// Example middleware
-    timestamp: new Date().toISOString()  (req: Request, res: Response, next: Function) => {
+  res.json({
+    message: 'This is a POST endpoint',
+    body: req.body,
+    timestamp: new Date().toISOString()
   });
-};    next();
+};
 
 export const put = (req: Request, res: Response) => {
   res.json({
     message: 'This is a PUT endpoint',
-    body: req.body,TE_TEMPLATE = `import { Request, Response } from 'express';
+    body: req.body,
     timestamp: new Date().toISOString()
-  });t const get = (req: Request, res: Response) => {
-};res.json({
-    message: 'This is a dynamic route GET endpoint',
+  });
+};
+
 export const delete_ = (req: Request, res: Response) => {
-  res.json({eq.query,
+  res.json({
     message: 'This is a DELETE endpoint',
     timestamp: new Date().toISOString()
   });
 };
-t const put = (req: Request, res: Response) => {
-// You can add middleware that will be applied to all methodsres.json({
-export const middleware = [    message: 'This is a dynamic route PUT endpoint',
+
+// You can add middleware that will be applied to all methods
+export const middleware = [
   // Example middleware
-  (req: Request, res: Response, next: Function) => {q.body,
+  (req: Request, res: Response, next: Function) => {
     console.log(\`\${req.method} \${req.url} - \${new Date().toISOString()}\`);
     next();
   }
 ];
-`;port const delete_ = (req: Request, res: Response) => {
-res.json({
-const DYNAMIC_API_ROUTE_TEMPLATE = `import { Request, Response } from 'express';    message: 'This is a dynamic route DELETE endpoint',
+`;
+
+const DYNAMIC_API_ROUTE_TEMPLATE = `import { Request, Response } from 'express';
 
-export const get = (req: Request, res: Response) => {ng()
+export const get = (req: Request, res: Response) => {
   res.json({
     message: 'This is a dynamic route GET endpoint',
     params: req.params,
     query: req.query,
-    timestamp: new Date().toISOString()template
-  });EMPLATE = `{
+    timestamp: new Date().toISOString()
+  });
 };
-,
-export const put = (req: Request, res: Response) => {ext",
-  res.json({on": "NodeNext",
-    message: 'This is a dynamic route PUT endpoint',rue,
-    params: req.params,"outDir": "./dist",
+
+export const post = (req: Request, res: Response) => {
+  res.json({
+    message: 'This is a dynamic route POST endpoint',
+    params: req.params,
     body: req.body,
     timestamp: new Date().toISOString()
-  }); "noEmit": false,
-};    "strict": true,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+  });
+};
 
+export const put = (req: Request, res: Response) => {
+  res.json({
+    message: 'This is a dynamic route PUT endpoint',
+    params: req.params,
+    body: req.body,
+    timestamp: new Date().toISOString()
+  });
+};
 
+export const delete_ = (req: Request, res: Response) => {
+  res.json({
+    message: 'This is a dynamic route DELETE endpoint',
+    params: req.params,
+    timestamp: new Date().toISOString()
+  });
+};
 
+// You can add middleware that will be applied to all methods
+export const middleware = [
+  // Example middleware
+  (req: Request, res: Response, next: Function) => {
+    console.log(\`\${req.method} \${req.url} - \${new Date().toISOString()}\`);
+    next();
+  }
+];
+`;
 
-init().catch(console.error);}`;  "exclude": ["node_modules", "dist", "**/*.test.ts"]  "include": ["server.ts", "api/**/*.ts"],  },    "skipLibCheck": true    "strict": true,    "noEmit": false,    "sourceMap": true,    "declaration": true,    "outDir": "./dist",    "esModuleInterop": true,    "moduleResolution": "NodeNext",    "module": "NodeNext",    "target": "ES2020",  "compilerOptions": {const TSCONFIG_SERVER_TEMPLATE = `{// Add tsconfig.server.json template`;};  });    timestamp: new Date().toISOString()    params: req.params,    message: 'This is a dynamic route DELETE endpoint',  res.json({export const delete_ = (req: Request, res: Response) => {  },
+// Add tsconfig.server.json template
+const TSCONFIG_SERVER_TEMPLATE = `{
+  "compilerOptions": {
+    "target": "ES2020",
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
+    "esModuleInterop": true,
+    "outDir": "./dist",
+    "declaration": true,
+    "sourceMap": true,
+    "noEmit": false,
+    "strict": true,
+    "skipLibCheck": true
+  },
   "include": ["server.ts", "api/**/*.ts"],
   "exclude": ["node_modules", "dist", "**/*.test.ts"]
 }`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "frontend-hamroun",
-  "version": "1.2.17",
+  "version": "1.2.18",
   "description": "A lightweight full-stack JavaScript framework",
   "type": "module",
   "main": "./dist/index.js",
@@ -19,6 +19,11 @@
       "import": "./dist/index.mjs",
       "require": "./dist/index.js",
       "default": "./dist/index.js"
+    },
+    "./server": {
+      "types": "./dist/server/index.d.ts",
+      "import": "./dist/server/index.js",
+      "require": "./dist/server/index.js"
     }
   },
   "bin": {