@flowdevcli/flowdev 1.0.1 → 1.0.3

package/package.json

@@ -1,12 +1,11 @@
 {
   "name": "@flowdevcli/flowdev",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "AI-powered CLI tool",
-  "main": "bin/flowdev.js",
   "type": "module",
   "bin": {
-    "flowdev": "./bin/flowdev.js",
-    "fd": "./bin/flowdev.js"
+    "flowdev": "bin/flowdev.js",
+    "fd": "bin/flowdev.js"
   },
   "scripts": {
     "start": "node bin/flowdev.js",
@@ -44,8 +43,7 @@
     "eslint": "^8.52.0",
     "mocha": "^10.2.0"
   },
-
   "publishConfig": {
-  "access": "public"
-}
-}
+    "access": "public"
+  }
+}

package/src/commands/scaffold/generate.js

@@ -10,7 +10,6 @@ const pythonCmd = process.platform === 'win32' ? 'python' : 'python3';
 const npmCmd = process.platform === 'win32' ? 'npm.cmd' : 'npm';
 const npxCmd = process.platform === 'win32' ? 'npx.cmd' : 'npx';
 
-
 const PYTHON_REGEX = /^[a-zA-Z_][a-zA-Z0-9_]*$/;
 const GENERAL_REGEX = /^[a-zA-Z][a-zA-Z0-9-_]*$/;
 
@@ -36,44 +35,25 @@ export async function generateCommand() {
       validate: (input, currentAnswers) => {
         const name = input.trim();
         if (!name) return 'A name is required.';
-
-        if (/^\d/.test(name)) {
-          return ' Name cannot start with a number. Please use a letter.';
-        }
-
-      
+        if (/^\d/.test(name)) return 'Name cannot start with a number.';
+        
         if (currentAnswers.type === 'django') {
-          if (!PYTHON_REGEX.test(name)) {
-            return ' Django projects cannot contain dashes (-) or spaces. Use underscores (_) instead.';
-          }
-        } 
-       
-        else {
-          if (!GENERAL_REGEX.test(name)) {
-            return ' Invalid name. Use letters, numbers, dashes (-) or underscores (_).';
-          }
+          if (!PYTHON_REGEX.test(name)) return 'Use underscores (_) for Django projects.';
+        } else {
+          if (!GENERAL_REGEX.test(name)) return 'Invalid characters used.';
         }
-
         return true;
       }
     }
   ]);
 
-  
   if (answers.type === 'django') {
     const djangoSub = await inquirer.prompt([{
       type: 'input',
       name: 'appName',
       message: 'Initial app name:',
       default: 'core',
-      validate: (input) => {
-        const name = input.trim();
-        
-        if (!PYTHON_REGEX.test(name)) {
-          return ' Invalid Python App name. Must start with a letter and contain no dashes.';
-        }
-        return true;
-      }
+      validate: (input) => PYTHON_REGEX.test(input) || 'Invalid Python App name.'
     }]);
     answers.appName = djangoSub.appName;
   }
@@ -97,18 +77,15 @@ export async function generateCommand() {
     }
 
     await initGit(projectDir, spinner);
-
-    spinner.succeed(chalk.green(`Project "${answers.projectName}" is ready and configured!`));
+    spinner.succeed(chalk.green(`Project "${answers.projectName}" is ready!`));
     showSuccessTips(answers);
 
   } catch (error) {
     spinner.fail(chalk.red('Generation failed.'));
-    console.error(chalk.red(`\nDetailed Error: ${error.message}`));
+    console.error(chalk.red(`\nError: ${error.message}`));
   }
 }
 
-
-
 async function setupVite(dir, name, framework, withTailwind, spinner) {
   spinner.text = `Scaffolding ${framework} with Vite...`;
   execSync(`${npmCmd} create vite@latest "${name}" -- --template ${framework}`, { stdio: 'ignore' });
@@ -119,13 +96,17 @@ async function setupVite(dir, name, framework, withTailwind, spinner) {
   spinner.text = 'Installing core dependencies...';
   execSync(`${npmCmd} install`, { stdio: 'ignore' });
 
+
   const folders = ['components', 'services', 'utils', 'hooks', 'assets'];
   for (const f of folders) await fs.ensureDir(path.join(dir, 'src', f));
 
   if (withTailwind) {
-    spinner.text = 'Installing & Configuring Tailwind CSS (Manual Setup)...';
-    execSync(`${npmCmd} install -D tailwindcss postcss autoprefixer`, { stdio: 'ignore' });
+    spinner.text = 'Configuring Tailwind CSS v3...';
+    
+   
+    execSync(`${npmCmd} install -D tailwindcss@3 postcss@8 autoprefixer@10`, { stdio: 'ignore' });
 
+    
     const tailwindConfig = `/** @type {import('tailwindcss').Config} */
 export default {
   content: [
@@ -139,6 +120,7 @@ export default {
 }`;
     await fs.writeFile(path.join(dir, 'tailwind.config.js'), tailwindConfig);
 
+    
     const postcssConfig = `export default {
   plugins: {
     tailwindcss: {},
@@ -147,7 +129,18 @@ export default {
 }`;
     await fs.writeFile(path.join(dir, 'postcss.config.js'), postcssConfig);
 
-    const cssPath = path.join(dir, 'src', 'index.css');
+    
+    const possibleCssFiles = ['index.css', 'style.css', 'App.css'];
+    let targetCssFile = 'index.css';
+
+    for (const file of possibleCssFiles) {
+      if (await fs.pathExists(path.join(dir, 'src', file))) {
+        targetCssFile = file;
+        break;
+      }
+    }
+
+    const cssPath = path.join(dir, 'src', targetCssFile);
     const tailwindDirectives = `@tailwind base;\n@tailwind components;\n@tailwind utilities;\n\n`;
     
     let currentCss = "";
@@ -163,35 +156,18 @@ export default {
 async function setupDjango(dir, data, spinner) {
   const { projectName, appName } = data;
   const isWin = process.platform === 'win32';
-  
   await fs.ensureDir(dir);
   const originalDir = process.cwd();
   process.chdir(dir);
-
   try {
-    spinner.text = 'Creating virtual environment...';
+    spinner.text = 'Setting up Django environment...';
     execSync(`${pythonCmd} -m venv venv`, { stdio: 'ignore' });
-
-    const venvPython = isWin 
-      ? path.join(dir, 'venv', 'Scripts', 'python.exe') 
-      : path.join(dir, 'venv', 'bin', 'python');
-
-    spinner.text = 'Installing Django...';
+    const venvPython = isWin ? path.join(dir, 'venv', 'Scripts', 'python.exe') : path.join(dir, 'venv', 'bin', 'python');
     execSync(`"${venvPython}" -m pip install django`, { stdio: 'ignore' });
-
-    spinner.text = 'Initializing Django project...';
-    
     execSync(`"${venvPython}" -m django startproject config .`, { stdio: 'ignore' });
-
-    spinner.text = `Creating app: ${appName}...`;
     execSync(`"${venvPython}" manage.py startapp ${appName}`, { stdio: 'ignore' });
-
-    await fs.writeFile(path.join(dir, appName, 'urls.py'), 
-      `from django.urls import path\nfrom . import views\n\nurlpatterns = [ path('', views.index, name='index'), ]`);
-    
-    await fs.writeFile(path.join(dir, appName, 'views.py'), 
-      `from django.http import HttpResponse\n\ndef index(request):\n    return HttpResponse("<h1>${projectName} is live!</h1>")`);
-
+    await fs.writeFile(path.join(dir, appName, 'urls.py'), `from django.urls import path\nfrom . import views\n\nurlpatterns = [ path('', views.index, name='index'), ]`);
+    await fs.writeFile(path.join(dir, appName, 'views.py'), `from django.http import HttpResponse\n\ndef index(request):\n    return HttpResponse("<h1>${projectName} is live!</h1>")`);
   } finally {
     process.chdir(originalDir);
   }
@@ -202,14 +178,13 @@ async function initGit(dir, spinner) {
     spinner.text = 'Initializing Git...';
     const ignorePath = path.join(dir, '.gitignore');
     if (!(await fs.pathExists(ignorePath))) {
-      const defaultIgnore = 'node_modules\n.env\ndist\nbuild\n__pycache__\n*.log\nvenv\n.venv\n';
-      await fs.writeFile(ignorePath, defaultIgnore);
+      await fs.writeFile(ignorePath, 'node_modules\n.env\ndist\nbuild\n__pycache__\n*.log\nvenv\n');
     }
     const originalDir = process.cwd();
     process.chdir(dir);
     execSync('git init', { stdio: 'ignore' });
     execSync('git add .', { stdio: 'ignore' });
-    execSync('git commit -m "Initial commit by FlowDev 🚀"', { stdio: 'ignore' });
+    execSync('git commit -m "Initial commit by FlowDev "', { stdio: 'ignore' });
     process.chdir(originalDir);
   } catch (err) {
     spinner.warn(chalk.yellow('Git initialization skipped.'));
@@ -218,26 +193,27 @@ async function initGit(dir, spinner) {
 
 async function setupAngular(dir, name, spinner) {
   spinner.text = 'Generating Angular Workspace...';
-  
   execSync(`${npxCmd} --yes -p @angular/cli ng new "${name}" --defaults --skip-git`, { stdio: 'ignore' });
 }
 
 async function setupExpress(dir, name, spinner) {
   spinner.text = 'Setting up Express...';
   await fs.ensureDir(dir);
-  const pkg = { name, version: '1.0.0', scripts: { start: 'node src/index.js' }, dependencies: { express: '^4.18.2', cors: '^2.8.5' }};
+  const pkg = { name, version: '1.0.0', type: 'module', scripts: { start: 'node src/index.js' }, dependencies: { express: '^4.18.2', cors: '^2.8.5' }};
   await fs.writeJson(path.join(dir, 'package.json'), pkg, { spaces: 2 });
   await fs.ensureDir(path.join(dir, 'src'));
-  await fs.writeFile(path.join(dir, 'src', 'index.js'), `const express = require('express');\nconst app = express();\napp.get('/', (req, res) => res.send('API OK'));\napp.listen(3000);`);
+  await fs.writeFile(path.join(dir, 'src', 'index.js'), `import express from 'express';\nconst app = express();\napp.get('/', (req, res) => res.send('API OK'));\napp.listen(3000, () => console.log('Server on 3000'));`);
+  const originalDir = process.cwd();
   process.chdir(dir);
   execSync(`${npmCmd} install`, { stdio: 'ignore' });
+  process.chdir(originalDir);
 }
 
 function showSuccessTips(data) {
   console.log(chalk.yellow('\n  Tips :'));
   console.log(`${chalk.white('*')} cd ${chalk.bold(data.projectName)}`);
   if (data.type.includes('tailwind')) {
-    console.log(`${chalk.green('*')} Tailwind & PostCSS are manually configured.`);
+    console.log(`${chalk.green('*')} Tailwind CSS v3 successfully configured.`);
     console.log(`${chalk.white('*')} Run: ${chalk.bold('npm run dev')}`);
   } else if (data.type === 'django') {
     console.log(`${chalk.white('*')} Run: ${chalk.bold('python manage.py runserver')}`);