@ardly/bunext 1.0.5 → 1.0.6

package/bin/cli.mjs

@@ -2,26 +2,15 @@
 
 import { execSync } from 'child_process'
 import readline from 'readline'
-import { createSpinner } from './utils.mjs'
-
-// ANSI color codes for terminal output
-const colors = {
-  reset: '\x1b[0m',
-  cyan: '\x1b[36m',
-  green: '\x1b[32m',
-  yellow: '\x1b[33m',
-  red: '\x1b[31m',
-  bold: '\x1b[1m',
-  dim: '\x1b[2m',
-}
 
 const runCommand = (command) => {
   try {
     execSync(`${command}`, { stdio: 'inherit' })
-    return true
   } catch (error) {
+    console.error(`Failed to run command: ${command}`, error)
     return false
   }
+  return true
 }
 
 const rl = readline.createInterface({
@@ -29,50 +18,52 @@ const rl = readline.createInterface({
   output: process.stdout,
 })
 
-const question = (query) =>
-  new Promise((resolve) => rl.question(query, resolve))
-
 let repoName = process.argv[2]
 const args = process.argv.slice(2)
 const useVSCode = args.includes('--vs')
 const useCursor = args.includes('--cursor')
 
-async function initializeProject() {
-  console.log(
-    `\n${colors.cyan}${colors.bold}🚀 Bunext - Next.js Project Generator${colors.reset}\n`
-  )
+const validateRepoName = (name) => {
+  const validNameRegex = /^[a-z0-9-]+$/
+  return validNameRegex.test(name)
+}
 
-  if (!repoName || repoName.startsWith('--')) {
-    repoName = await question(`${colors.yellow}? ${colors.reset}Project name: `)
-    if (!repoName) {
-      console.log(`${colors.red}✖ Project name is required${colors.reset}`)
-      process.exit(1)
+const promptForValidRepoName = (callback) => {
+  rl.question(
+    'Please enter a name for your project (lowercase letters, numbers and hyphens only): ',
+    (answer) => {
+      if (validateRepoName(answer)) {
+        repoName = answer
+        callback()
+      } else {
+        console.error(
+          'Invalid project name. Please use only lowercase letters, numbers and hyphens.'
+        )
+        promptForValidRepoName(callback)
+      }
     }
-  }
+  )
+}
 
-  const spinner = createSpinner()
+if (!repoName || repoName.startsWith('--')) {
+  promptForValidRepoName(initializeProject)
+} else if (!validateRepoName(repoName)) {
+  console.error(
+    'Invalid project name. Please use only lowercase letters, numbers and hyphens.'
+  )
+  promptForValidRepoName(initializeProject)
+} else {
+  initializeProject()
+}
 
-  // Clone repository
-  spinner.start('Creating project template')
+function initializeProject() {
   const gitCheckout = `git clone --depth 1 https://github.com/DarkidOP/Bunext.git ${repoName}`
-  const checkedOut = runCommand(gitCheckout)
-  if (!checkedOut) {
-    spinner.fail('Failed to clone template repository')
-    process.exit(1)
-  }
-  spinner.succeed(`Project template created in ./${repoName}`)
-
-  // Remove git
-  spinner.start('Removing Git history')
   const removeGit = `cd ${repoName} && rm -rf .git`
-  const removedGit = runCommand(removeGit)
-  if (!removedGit) {
-    spinner.fail('Failed to remove Git history')
-    process.exit(1)
-  }
-  spinner.succeed('Git history removed')
+  const initGit = `cd ${repoName} && git init && git add . && git commit -m "Initial commit"`
+  const openVSCode = `cd ${repoName} && code .`
+  const openCursor = `cd ${repoName} && cursor .`
 
-  // Detect package manager
+  // Determine package manager based on how script was executed
   let packageManager = 'npm'
   if (process.env.npm_execpath?.includes('pnpm')) {
     packageManager = 'pnpm'
@@ -82,52 +73,54 @@ async function initializeProject() {
     packageManager = 'bun'
   }
 
-  // Install dependencies
-  spinner.start(`Installing dependencies using ${packageManager}`)
-  const installDeps = `cd ${repoName} && ${packageManager}${
-    packageManager === 'npm' ? ' install --legacy-peer-deps' : ' install'
-  }`
-  const installedDeps = runCommand(installDeps)
-  if (!installedDeps) {
-    spinner.fail('Failed to install dependencies')
+  const installDeps = `cd ${repoName} && ${packageManager}${packageManager === 'npm' ? ' install --legacy-peer-deps' : ' install'}`
+
+  console.log(`Creating project template in ./${repoName}`)
+  const checkedOut = runCommand(gitCheckout)
+  if (!checkedOut) {
+    console.error(
+      'Failed to clone template repository "https://github.com/DarkidOP/Bunext.git"'
+    )
     process.exit(1)
   }
-  spinner.succeed('Dependencies installed')
 
-  // Git init prompt
-  const initGit = await question(
-    `${colors.yellow}? ${colors.reset}Initialize Git repository? (y/N) `
-  )
-  if (initGit.toLowerCase() === 'y') {
-    spinner.start('Initializing Git repository')
-    const gitInit = `cd ${repoName} && git init && git add . && git commit -m "Initial commit"`
-    const initializedGit = runCommand(gitInit)
-    if (!initializedGit) {
-      spinner.fail('Failed to initialize Git repository')
-      process.exit(1)
-    }
-    spinner.succeed('Git repository initialized')
+  console.log('Removing Git history...')
+  const removedGit = runCommand(removeGit)
+  if (!removedGit) {
+    console.error('Failed to remove Git history')
+    process.exit(1)
   }
 
-  // Open in editor if specified
-  if (useVSCode) {
-    runCommand(`cd ${repoName} && code .`)
-    console.log(`${colors.dim}Opening in Visual Studio Code...${colors.reset}`)
-  } else if (useCursor) {
-    runCommand(`cd ${repoName} && cursor .`)
-    console.log(`${colors.dim}Opening in Cursor...${colors.reset}`)
+  console.log('Installing dependencies...')
+  const installedDeps = runCommand(installDeps)
+  if (!installedDeps) {
+    console.error('Failed to install dependencies')
+    process.exit(1)
   }
 
-  console.log(
-    `\n${colors.green}${colors.bold}✨ Success! Your project is ready.${colors.reset}`
-  )
-  console.log(`\n${colors.dim}To get started:${colors.reset}`)
-  console.log(`\n  cd ${repoName}`)
-  console.log(
-    `  ${packageManager}${packageManager === 'npm' ? ' run' : ''} dev\n`
+  rl.question(
+    'Would you like to initialize a new git repository? (y/n) ',
+    (answer) => {
+      if (answer.toLowerCase() === 'y' || answer.toLowerCase() === 'yes') {
+        console.log('Initializing Git repository...')
+        const initializedGit = runCommand(initGit)
+        if (!initializedGit) {
+          console.error('Failed to initialize Git repository')
+          process.exit(1)
+        }
+        console.log('Git repository initialized successfully!')
+      }
+
+      if (useVSCode) {
+        console.log('Opening in Visual Studio Code...')
+        runCommand(openVSCode)
+      } else if (useCursor) {
+        console.log('Opening in Cursor...')
+        runCommand(openCursor)
+      }
+
+      console.log('\nHappy coding! 🎉')
+      rl.close()
+    }
   )
-
-  rl.close()
 }
-
-// Create utils.mjs for the spinner

package/package.json

@@ -2,7 +2,7 @@
   "name": "@ardly/bunext",
   "description": "Bunext - A Next.js 15 template with Tailwind CSS, shadcn ui and Bun with some utilities built in",
   "author": "Ard Astroid <ardastroid@gmail.com>",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "bin": "./bin/cli.mjs",
   "keywords": [
     "next.js",

package/bin/utils.mjs

@@ -1,32 +0,0 @@
-const spinner = {
-  frames: ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'],
-  interval: 80,
-}
-
-export function createSpinner() {
-  let currentFrame = 0
-  let intervalId
-  let text = ''
-
-  return {
-    start(message) {
-      text = message
-      process.stdout.write('\x1b[?25l') // Hide cursor
-      intervalId = setInterval(() => {
-        const frame = spinner.frames[currentFrame]
-        process.stdout.write(`\r${frame} ${text}`)
-        currentFrame = (currentFrame + 1) % spinner.frames.length
-      }, spinner.interval)
-    },
-    succeed(message) {
-      clearInterval(intervalId)
-      process.stdout.write('\r✓ ' + (message || text) + '\n')
-      process.stdout.write('\x1b[?25h') // Show cursor
-    },
-    fail(message) {
-      clearInterval(intervalId)
-      process.stdout.write('\r✖ ' + (message || text) + '\n')
-      process.stdout.write('\x1b[?25h') // Show cursor
-    },
-  }
-}