create-zerra-app 1.1.0 → 1.2.1

package/index.js

@@ -27,36 +27,79 @@ program
         ],
       },
       {
-        type: "confirm",
-        name: "installDeps",
-        message: "Would you like to install dependencies automatically?",
-        default: true,
+        type: "list",
+        name: "language",
+        message: "Choose your primary language:",
+        choices: [
+          { name: "JavaScript", value: "js" },
+          { name: "TypeScript", value: "ts" },
+        ],
+        default: "js",
       },
       {
         type: "confirm",
-        name: "initGit",
-        message: "Would you like to initialize a new git repository?",
+        name: "includeAuth",
+        message: "Include Authentication Starter (JWT + Bcrypt)?",
         default: true,
       },
       {
         type: "checkbox",
         name: "features",
-        message: "Which advanced Zerra features would you like to enable?",
+        message: "Select advanced features to enable:",
         choices: [
           { name: "Beautiful Request Logging", value: "logging", checked: true },
           { name: "Dynamic Routing ([id].js)", value: "dynamicRouting", checked: true },
           { name: "File-Based Middleware (_middleware.js)", value: "middleware", checked: true },
           { name: "Auto-load Environment Variables (.env)", value: "dotenv", checked: true },
           { name: "Automatic Input Validation (Schema)", value: "validation", checked: true },
-          { name: "Multipart File Uploads (req.files)", value: "multipart", checked: true }
+          { name: "Multipart File Uploads (req.files)", value: "multipart", checked: true },
+          { name: "Smart Error Handling (_error.js)", value: "errors", checked: true },
+          { name: "Dev Dashboard (/__zerra)", value: "dashboard", checked: true }
         ]
+      },
+      {
+        type: "confirm",
+        name: "installDeps",
+        message: "Install dependencies automatically?",
+        default: true,
+      },
+      {
+        type: "confirm",
+        name: "initGit",
+        message: "Initialize git repository?",
+        default: true,
       }
     ]);
 
+    // 2. Project Preview Summary
+    console.log(`\n📋  Project Configuration:`);
+    console.log(`   - Project Name: \x1b[36m${projectName}\x1b[0m`);
+    console.log(`   - Database:     \x1b[33m${answers.database.replace('js-', '')}\x1b[0m`);
+    console.log(`   - Auth Starter: \x1b[32m${answers.includeAuth ? 'Enabled' : 'Disabled'}\x1b[0m`);
+    console.log(`   - Language:     \x1b[36m${answers.language.toUpperCase()}\x1b[0m`);
+    console.log(`   - Features:     \x1b[35m${answers.features.join(', ') || 'None'}\x1b[0m`);
+    console.log(`   - Auto-Install: \x1b[32m${answers.installDeps ? 'Yes' : 'No'}\x1b[0m`);
+    console.log(`   - Git Init:     \x1b[32m${answers.initGit ? 'Yes' : 'No'}\x1b[0m`);
+
+    const { confirmProceed } = await inquirer.prompt([
+      {
+        type: "confirm",
+        name: "confirmProceed",
+        message: "Does this look correct?",
+        default: true,
+      }
+    ]);
+
+    if (!confirmProceed) {
+      console.log("\n❌  Project creation cancelled.\n");
+      return;
+    }
+
     const baseTemplatePath = path.join(__dirname, "templates", "js-base");
     const dbTemplatePath = path.join(__dirname, "templates", answers.database);
+    const authTemplatePath = path.join(__dirname, "templates", "js-auth");
 
-    console.log(`\n🏗️  Generating Zerra project: ${projectName}...`);
+    console.log(`\n🏗️  Building your Zerra application...`);
 
     try {
       // 1. Copy the Base Template (Foundation)
@@ -87,14 +130,91 @@ program
         }
       }
 
+      // 2.5 Overlay Auth Starter (if selected)
+      if (answers.includeAuth && fs.existsSync(authTemplatePath)) {
+        console.log(`   🔐 Adding Auth Starter...`);
+        await fs.copy(authTemplatePath, targetPath, {
+          overwrite: true,
+          filter: (src) => !src.endsWith("package.json"),
+        });
+
+        const authPkgPath = path.join(authTemplatePath, "package.json");
+        const targetPkgPath = path.join(targetPath, "package.json");
+
+        if (fs.existsSync(authPkgPath) && fs.existsSync(targetPkgPath)) {
+          const basePkg = await fs.readJson(targetPkgPath);
+          const authPkg = await fs.readJson(authPkgPath);
+          basePkg.dependencies = { ...(basePkg.dependencies || {}), ...(authPkg.dependencies || {}) };
+          await fs.writeJson(targetPkgPath, basePkg, { spaces: 2 });
+        }
+      }
+
       // 3. Customize project name in package.json
       const pkgPath = path.join(targetPath, "package.json");
       if (fs.existsSync(pkgPath)) {
         const pkg = await fs.readJson(pkgPath);
         pkg.name = projectName;
+
+        if (answers.language === 'ts') {
+          pkg.devDependencies = {
+            ...(pkg.devDependencies || {}),
+            "typescript": "^5.0.0",
+            "@types/node": "^20.0.0",
+            "tsx": "^4.0.0"
+          };
+          pkg.scripts = {
+            ...(pkg.scripts || {}),
+            "dev": "tsx watch server.js",
+            "build": "tsc",
+            "start": "node server.js"
+          };
+        }
         await fs.writeJson(pkgPath, pkg, { spaces: 2 });
       }
 
+      // 3.5 Handle TypeScript File Renaming and tsconfig
+      if (answers.language === 'ts') {
+        console.log(`   TypeScript-ifying your project...`);
+        
+        // Generate tsconfig.json
+        const tsconfig = {
+          compilerOptions: {
+            target: "ESNext",
+            module: "CommonJS",
+            moduleResolution: "node",
+            esModuleInterop: true,
+            forceConsistentCasingInFileNames: true,
+            strict: true,
+            skipLibCheck: true,
+            outDir: "./dist"
+          },
+          include: ["api/**/*", "services/**/*", "server.js", "zerra.config.json"]
+        };
+        await fs.writeJson(path.join(targetPath, "tsconfig.json"), tsconfig, { spaces: 2 });
+
+        // Recursive function to rename .js to .ts
+        const renameJsToTs = async (dir) => {
+          const files = await fs.readdir(dir);
+          for (const file of files) {
+            const fullPath = path.join(dir, file);
+            const stat = await fs.stat(fullPath);
+            if (stat.isDirectory()) {
+              await renameJsToTs(fullPath);
+            } else if (file.endsWith(".js") && !file.startsWith("server.js")) {
+              const newPath = fullPath.replace(/\.js$/, ".ts");
+              await fs.move(fullPath, newPath);
+            }
+          }
+        };
+
+        if (fs.existsSync(path.join(targetPath, "api"))) {
+          await renameJsToTs(path.join(targetPath, "api"));
+        }
+        if (fs.existsSync(path.join(targetPath, "services"))) {
+          await renameJsToTs(path.join(targetPath, "services"));
+        }
+      }
+
       // 4. Generate zerra.config.json based on feature selection
       const featureConfig = {
         logging: answers.features.includes('logging'),
@@ -102,11 +222,26 @@ program
         middleware: answers.features.includes('middleware'),
         dotenv: answers.features.includes('dotenv'),
         validation: answers.features.includes('validation'),
-        multipart: answers.features.includes('multipart')
+        multipart: answers.features.includes('multipart'),
+        errors: answers.features.includes('errors'),
+        dashboard: answers.features.includes('dashboard')
       };
       
       const configJsonPath = path.join(targetPath, 'zerra.config.json');
-      await fs.writeJson(configJsonPath, { features: featureConfig }, { spaces: 2 });
+      await fs.writeJson(configJsonPath, { features: featureConfig, plugins: [] }, { spaces: 2 });
+
+      // 4.5 Generate .gitignore for the new project
+      const gitignoreContent = `node_modules/
+dist/
+build/
+.env
+.env.local
+.env.*.local
+*.log
+.DS_Store
+${answers.language === 'ts' ? '*.tsbuildinfo' : ''}
+`;
+      await fs.writeFile(path.join(targetPath, '.gitignore'), gitignoreContent);
 
       const { execSync } = require("child_process");
       

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-zerra-app",
-  "version": "1.1.0",
+  "version": "1.2.1",
   "description": "",
   "main": "index.js",
   "bin": {

package/templates/js-auth/api/auth/login.js

@@ -0,0 +1,15 @@
+const auth = require('../../services/auth');
+
+module.exports = async (req, res) => {
+  const { email, password } = req.body;
+
+  // Mock user for the starter
+  const mockUser = { id: 1, email: 'user@example.com', password: auth.hashPassword('password123') };
+
+  if (email === mockUser.email && auth.comparePassword(password, mockUser.password)) {
+    const token = auth.generateToken(mockUser);
+    return res.json({ token, message: "Login successful" });
+  }
+
+  res.status(401).json({ error: "Invalid credentials" });
+};

package/templates/js-auth/api/auth/register.js

@@ -0,0 +1,24 @@
+const auth = require('../../services/auth');
+
+// Note: This is a starter. In a real app, you would save the user to your database.
+module.exports = async (req, res) => {
+  const { email, password } = req.body;
+
+  if (!email || !password) {
+    return res.status(400).json({ error: "Email and password are required" });
+  }
+
+  const hashedPassword = auth.hashPassword(password);
+  
+  // Here you would: await db.users.create({ email, password: hashedPassword })
+
+  res.status(201).json({ 
+    message: "User registered successfully (Starter Mock)",
+    user: { email }
+  });
+};
+
+module.exports.schema = {
+  email: 'string',
+  password: 'string'
+};

package/templates/js-auth/api/protected/_middleware.js

@@ -0,0 +1,17 @@
+const auth = require('../../services/auth');
+
+module.exports = async (req, res, next) => {
+  const token = req.headers.authorization?.split(' ')[1];
+
+  if (!token) {
+    return res.status(401).json({ error: "No token provided" });
+  }
+
+  try {
+    const decoded = auth.verifyToken(token);
+    req.user = decoded;
+    await next();
+  } catch (e) {
+    res.status(401).json({ error: "Invalid or expired token" });
+  }
+};

package/templates/js-auth/api/protected/secret.js

@@ -0,0 +1,6 @@
+module.exports = async (req, res) => {
+  res.json({ 
+    message: "Welcome to the secret area!",
+    user: req.user 
+  });
+};

package/templates/js-auth/package.json

@@ -0,0 +1,6 @@
+{
+  "dependencies": {
+    "jsonwebtoken": "^9.0.2",
+    "bcryptjs": "^2.4.3"
+  }
+}

package/templates/js-auth/services/auth.js

@@ -0,0 +1,11 @@
+const jwt = require('jsonwebtoken');
+const bcrypt = require('bcryptjs');
+
+const JWT_SECRET = process.env.JWT_SECRET || 'zerra-secret-key';
+
+module.exports = {
+  hashPassword: (password) => bcrypt.hashSync(password, 10),
+  comparePassword: (password, hash) => bcrypt.compareSync(password, hash),
+  generateToken: (user) => jwt.sign({ id: user.id, email: user.email }, JWT_SECRET, { expiresIn: '1d' }),
+  verifyToken: (token) => jwt.verify(token, JWT_SECRET)
+};

package/templates/js-base/package.json

@@ -5,6 +5,6 @@
     "dev": "node server.js"
   },
   "dependencies": {
-    "zerra-core": "^1.1.0"
+    "zerra-core": "^1.2.1"
   }
 }