create-sonicjs 2.0.0 → 2.0.6

package/README.md

@@ -1,21 +1,21 @@
-# create-sonicjs-app
+# create-sonicjs
 
 > The easiest way to create a new SonicJS application
 
-[![Version](https://img.shields.io/npm/v/create-sonicjs-app)](https://www.npmjs.com/package/create-sonicjs-app)
-[![License](https://img.shields.io/npm/l/create-sonicjs-app)](./LICENSE)
+[![Version](https://img.shields.io/npm/v/create-sonicjs)](https://www.npmjs.com/package/create-sonicjs)
+[![License](https://img.shields.io/npm/l/create-sonicjs)](./LICENSE)
 
 ## Quick Start
 
 ```bash
-npx create-sonicjs-app my-app
+npx create-sonicjs my-app
 ```
 
 That's it! Follow the interactive prompts and you'll have a running SonicJS application in minutes.
 
 ## What It Does
 
-`create-sonicjs-app` sets up everything you need for a modern headless CMS on Cloudflare's edge:
+`create-sonicjs` sets up everything you need for a modern headless CMS on Cloudflare's edge:
 
 - ✅ **Project scaffolding** - Complete project structure
 - ✅ **Template selection** - Choose from pre-built templates
@@ -30,7 +30,7 @@ That's it! Follow the interactive prompts and you'll have a running SonicJS appl
 ### Interactive Mode (Recommended)
 
 ```bash
-npx create-sonicjs-app
+npx create-sonicjs
 ```
 
 You'll be prompted for:
@@ -45,13 +45,13 @@ You'll be prompted for:
 ### With Project Name
 
 ```bash
-npx create-sonicjs-app my-blog
+npx create-sonicjs my-blog
 ```
 
 ### Command Line Options
 
 ```bash
-npx create-sonicjs-app my-app --template=starter --skip-install
+npx create-sonicjs my-app --template=starter --skip-install
 ```
 
 **Available flags:**
@@ -144,13 +144,13 @@ Works with all major package managers:
 
 ```bash
 # npm
-npx create-sonicjs-app my-app
+npx create-sonicjs my-app
 
 # yarn
-yarn create sonicjs-app my-app
+yarn create sonicjs my-app
 
 # pnpm
-pnpm create sonicjs-app my-app
+pnpm create sonicjs my-app
 ```
 
 The CLI automatically detects your package manager from lock files.
@@ -217,7 +217,7 @@ You can create resources manually after project creation. See the [After Creatio
 ### Skip All Prompts (Non-Interactive Mode)
 
 ```bash
-npx create-sonicjs-app my-app \
+npx create-sonicjs my-app \
   --template=starter \
   --database=my-app-db \
   --bucket=my-app-media \
@@ -230,7 +230,7 @@ npx create-sonicjs-app my-app \
 ### Use in CI/CD
 
 ```bash
-npx create-sonicjs-app test-app \
+npx create-sonicjs test-app \
   --template=starter \
   --database=test-db \
   --bucket=test-bucket \
@@ -254,7 +254,7 @@ npx create-sonicjs-app test-app \
 ### Create a blog
 
 ```bash
-npx create-sonicjs-app my-blog
+npx create-sonicjs my-blog
 # Select "Starter" template
 # Include example collection: Yes
 ```
@@ -262,7 +262,7 @@ npx create-sonicjs-app my-blog
 ### Create without examples
 
 ```bash
-npx create-sonicjs-app my-app
+npx create-sonicjs my-app
 # Include example collection: No
 ```
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-sonicjs",
-  "version": "2.0.0",
+  "version": "2.0.6",
   "description": "Create a new SonicJS application with zero configuration",
   "type": "module",
   "bin": {
@@ -40,10 +40,10 @@
   "dependencies": {
     "prompts": "^2.4.2",
     "kleur": "^4.1.5",
-    "ora": "^8.0.1",
-    "execa": "^9.5.2",
+    "ora": "^8.1.3",
+    "execa": "^10.0.0",
     "fs-extra": "^11.2.0",
-    "validate-npm-package-name": "^6.0.0"
+    "validate-npm-package-name": "^7.0.0"
   },
   "engines": {
     "node": ">=18.0.0"

package/src/cli.js

@@ -12,7 +12,7 @@ import validatePackageName from 'validate-npm-package-name'
 const __dirname = path.dirname(fileURLToPath(import.meta.url))
 
 // Version
-const VERSION = '2.0.0'
+const VERSION = '2.0.0-beta.9'
 
 // Templates available
 const TEMPLATES = {
@@ -135,6 +135,40 @@ async function getProjectDetails(initialName) {
     })
   }
 
+  // Seed admin user
+  questions.push({
+    type: 'confirm',
+    name: 'seedAdmin',
+    message: 'Create admin user?',
+    initial: true
+  })
+
+  // Admin email (only if seeding)
+  questions.push({
+    type: (prev, values) => values.seedAdmin ? 'text' : null,
+    name: 'adminEmail',
+    message: 'Admin email:',
+    validate: (value) => {
+      if (!value) return 'Admin email is required'
+      // Basic email validation
+      const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/
+      if (!emailRegex.test(value)) return 'Please enter a valid email address'
+      return true
+    }
+  })
+
+  // Admin password (only if seeding)
+  questions.push({
+    type: (prev, values) => values.seedAdmin ? 'password' : null,
+    name: 'adminPassword',
+    message: 'Admin password:',
+    validate: (value) => {
+      if (!value) return 'Admin password is required'
+      if (value.length < 8) return 'Password must be at least 8 characters'
+      return true
+    }
+  })
+
   // Include example collection (only ask if neither flag is set)
   if (!flags.skipExample && !flags.includeExample) {
     questions.push({
@@ -176,8 +210,12 @@ async function getProjectDetails(initialName) {
     template: flags.template || answers.template,
     databaseName: flags.databaseName || answers.databaseName || `${initialName || answers.projectName}-db`,
     bucketName: flags.bucketName || answers.bucketName || `${initialName || answers.projectName}-media`,
+    seedAdmin: answers.seedAdmin !== undefined ? answers.seedAdmin : true,
+    adminEmail: answers.adminEmail,
+    adminPassword: answers.adminPassword,
     includeExample: flags.skipExample ? false : (flags.includeExample ? true : (answers.includeExample !== undefined ? answers.includeExample : true)),
     createResources: flags.skipCloudflare ? false : answers.createResources,
+    runMigrations: true, // Always run migrations automatically
     initGit: flags.skipGit ? false : answers.initGit,
     skipInstall: flags.skipInstall
   }
@@ -189,8 +227,12 @@ async function createProject(answers, flags) {
     template,
     databaseName,
     bucketName,
+    adminEmail,
+    adminPassword,
     includeExample,
     createResources,
+    runMigrations,
+    seedAdmin,
     initGit,
     skipInstall
   } = answers
@@ -207,23 +249,37 @@ async function createProject(answers, flags) {
       projectName,
       databaseName,
       bucketName,
+      seedAdmin,
+      adminEmail,
+      adminPassword,
       includeExample
     })
     spinner.succeed('Copied template files')
 
     // 2. Create Cloudflare resources
     let databaseId = 'YOUR_DATABASE_ID'
+    let resourcesCreated = false
     if (createResources) {
       spinner.start('Creating Cloudflare resources...')
       try {
-        databaseId = await createCloudflareResources(databaseName, bucketName, targetDir)
-        spinner.succeed('Created Cloudflare resources')
+        const result = await createCloudflareResources(databaseName, bucketName, targetDir)
+        databaseId = result.databaseId || 'YOUR_DATABASE_ID'
+        resourcesCreated = result.success
+        if (resourcesCreated) {
+          spinner.succeed('Created Cloudflare resources')
+        } else {
+          spinner.warn('Cloudflare resources partially created - see details above')
+        }
       } catch (error) {
         spinner.warn('Failed to create Cloudflare resources')
         console.log(kleur.dim('  You can create them manually later'))
       }
     }
 
+    // Store resources status for success message
+    answers.resourcesCreated = resourcesCreated
+    answers.databaseIdSet = databaseId !== 'YOUR_DATABASE_ID'
+
     // 3. Update wrangler.toml with database ID
     spinner.start('Updating configuration...')
     await updateWranglerConfig(targetDir, { databaseName, databaseId, bucketName })
@@ -234,6 +290,11 @@ async function createProject(answers, flags) {
       spinner.start('Installing dependencies...')
       await installDependencies(targetDir)
       spinner.succeed('Installed dependencies')
+
+      // Copy migrations after install
+      spinner.start('Copying database migrations...')
+      await copyMigrationsFromCore(targetDir)
+      spinner.succeed('Copied database migrations')
     }
 
     // 5. Initialize git
@@ -243,6 +304,45 @@ async function createProject(answers, flags) {
       spinner.succeed('Initialized git repository')
     }
 
+    // 6. Run migrations
+    if (runMigrations && !skipInstall && resourcesCreated) {
+      spinner.start('Running database migrations...')
+      try {
+        await runDatabaseMigrations(targetDir)
+        spinner.succeed('Database migrations completed')
+        answers.migrationsRan = true
+      } catch (error) {
+        spinner.warn('Failed to run migrations')
+        console.log(kleur.dim(`  ${error.message}`))
+        console.log(kleur.dim('  You can run them manually with: npm run db:migrate:local'))
+        answers.migrationsRan = false
+      }
+    } else if (runMigrations && skipInstall) {
+      spinner.info('Skipping migrations - run after npm install')
+      answers.migrationsRan = false
+    } else if (runMigrations && !resourcesCreated) {
+      spinner.info('Skipping migrations - database not created yet')
+      answers.migrationsRan = false
+    }
+
+    // 7. Seed admin user
+    if (seedAdmin && !skipInstall && answers.migrationsRan) {
+      spinner.start('Seeding admin user...')
+      try {
+        await seedAdminUser(targetDir)
+        spinner.succeed('Admin user created')
+        answers.adminSeeded = true
+      } catch (error) {
+        spinner.warn('Failed to seed admin user')
+        console.log(kleur.dim(`  ${error.message}`))
+        console.log(kleur.dim('  You can run it manually with: npm run seed'))
+        answers.adminSeeded = false
+      }
+    } else if (seedAdmin && !answers.migrationsRan) {
+      spinner.info('Skipping seed - migrations not completed')
+      answers.adminSeeded = false
+    }
+
     spinner.succeed(kleur.bold().green('✓ Project created successfully!'))
 
   } catch (error) {
@@ -282,7 +382,7 @@ async function copyTemplate(templateName, targetDir, options) {
 
   // Add @sonicjs-cms/core dependency
   packageJson.dependencies = {
-    '@sonicjs-cms/core': '^2.0.0',
+    '@sonicjs-cms/core': '^2.0.5',
     ...packageJson.dependencies
   }
 
@@ -302,6 +402,159 @@ async function copyTemplate(templateName, targetDir, options) {
       await fs.remove(examplePath)
     }
   }
+
+  // Create admin seed script with provided credentials (only if creating admin user)
+  if (options.seedAdmin && options.adminEmail && options.adminPassword) {
+    await createAdminSeedScript(targetDir, {
+      email: options.adminEmail,
+      password: options.adminPassword
+    })
+  }
+}
+
+async function createAdminSeedScript(targetDir, { email, password }) {
+  const seedScriptContent = `import { createDb, users } from '@sonicjs-cms/core'
+import { eq } from 'drizzle-orm'
+import bcrypt from 'bcryptjs'
+
+/**
+ * Seed script to create initial admin user
+ *
+ * Run this script after migrations:
+ * npm run db:migrate:local
+ * npm run seed
+ *
+ * Admin credentials:
+ * Email: ${email}
+ * Password: [as entered during setup]
+ */
+
+interface Env {
+  DB: D1Database
+}
+
+async function seed() {
+  // Get D1 database from Cloudflare environment
+  // @ts-ignore - getPlatformProxy is available in wrangler
+  const { env } = await import('@cloudflare/workers-types/experimental')
+  const platform = (env as any).getPlatformProxy?.() || { env: {} }
+
+  if (!platform.env?.DB) {
+    console.error('❌ Error: DB binding not found')
+    console.error('')
+    console.error('Make sure you have:')
+    console.error('1. Created your D1 database: wrangler d1 create <database-name>')
+    console.error('2. Updated wrangler.toml with the database_id')
+    console.error('3. Run migrations: npm run db:migrate:local')
+    console.error('')
+    process.exit(1)
+  }
+
+  const db = createDb(platform.env.DB)
+
+  try {
+    // Check if admin user already exists
+    const existingUser = await db
+      .select()
+      .from(users)
+      .where(eq(users.email, '${email}'))
+      .get()
+
+    if (existingUser) {
+      console.log('✓ Admin user already exists')
+      console.log(\`  Email: ${email}\`)
+      console.log(\`  Role: \${existingUser.role}\`)
+      return
+    }
+
+    // Hash password using bcrypt
+    const passwordHash = await bcrypt.hash('${password}', 10)
+
+    // Create admin user
+    await db
+      .insert(users)
+      .values({
+        email: '${email}',
+        username: '${email.split('@')[0]}',
+        password: passwordHash,
+        role: 'admin',
+        isActive: 1,
+        createdAt: new Date().toISOString(),
+        updatedAt: new Date().toISOString()
+      })
+      .run()
+
+    console.log('✓ Admin user created successfully')
+    console.log(\`  Email: ${email}\`)
+    console.log(\`  Role: admin\`)
+    console.log('')
+    console.log('You can now login at: http://localhost:8787/auth/login')
+  } catch (error) {
+    console.error('❌ Error creating admin user:', error)
+    process.exit(1)
+  }
+}
+
+// Run seed
+seed()
+  .then(() => {
+    console.log('')
+    console.log('✓ Seeding complete')
+    process.exit(0)
+  })
+  .catch((error) => {
+    console.error('❌ Seeding failed:', error)
+    process.exit(1)
+  })
+`
+
+  // Create scripts directory
+  const scriptsDir = path.join(targetDir, 'scripts')
+  await fs.ensureDir(scriptsDir)
+
+  // Write seed script
+  const seedScriptPath = path.join(scriptsDir, 'seed-admin.ts')
+  await fs.writeFile(seedScriptPath, seedScriptContent)
+
+  // Add seed script to package.json
+  const packageJsonPath = path.join(targetDir, 'package.json')
+  const packageJson = await fs.readJson(packageJsonPath)
+
+  if (!packageJson.scripts) {
+    packageJson.scripts = {}
+  }
+
+  packageJson.scripts.seed = 'tsx scripts/seed-admin.ts'
+
+  await fs.writeJson(packageJsonPath, packageJson, { spaces: 2 })
+}
+
+async function copyMigrationsFromCore(targetDir) {
+  // The migrations are in @sonicjs-cms/core/migrations
+  // After npm install, they'll be in node_modules/@sonicjs-cms/core/migrations
+  const coreMigrationsPath = path.join(targetDir, 'node_modules', '@sonicjs-cms', 'core', 'migrations')
+  const projectMigrationsPath = path.join(targetDir, 'migrations')
+
+  // Check if core migrations exist (they should after npm install)
+  if (fs.existsSync(coreMigrationsPath)) {
+    // Copy migrations to project directory
+    await fs.copy(coreMigrationsPath, projectMigrationsPath)
+  } else {
+    // If migrations don't exist yet (npm install hasn't run), create a note file
+    await fs.ensureDir(projectMigrationsPath)
+    const noteContent = `# Migrations
+
+Migrations will be copied from @sonicjs-cms/core after running npm install.
+
+To manually copy migrations:
+1. Install dependencies: npm install
+2. Copy from: node_modules/@sonicjs-cms/core/migrations/
+3. Copy to: migrations/
+
+Or they should be automatically available after installation.
+`
+    await fs.writeFile(path.join(projectMigrationsPath, 'README.md'), noteContent)
+  }
 }
 
 async function createCloudflareResources(databaseName, bucketName, targetDir) {
@@ -312,10 +565,13 @@ async function createCloudflareResources(databaseName, bucketName, targetDir) {
     throw new Error('wrangler is not installed. Install with: npm install -g wrangler')
   }
 
-  // Create D1 database
   let databaseId
+  let dbCreated = false
+  let bucketCreated = false
+
+  // Create D1 database
   try {
-    const { stdout } = await execa('wrangler', ['d1', 'create', databaseName], {
+    const { stdout, stderr } = await execa('wrangler', ['d1', 'create', databaseName], {
       cwd: targetDir
     })
 
@@ -323,9 +579,22 @@ async function createCloudflareResources(databaseName, bucketName, targetDir) {
     const match = stdout.match(/database_id\s*=\s*["']([^"']+)["']/)
     if (match) {
       databaseId = match[1]
+      dbCreated = true
+    } else {
+      console.log('')
+      console.log(kleur.yellow('⚠ Warning: Could not parse database_id from wrangler output'))
+      console.log(kleur.dim('  You may need to manually update wrangler.toml'))
     }
   } catch (error) {
-    console.log(kleur.yellow('  D1 database creation failed'))
+    console.log('')
+    console.log(kleur.yellow('⚠ D1 database creation failed:'))
+    console.log(kleur.dim(`  ${error.message}`))
+    if (error.stderr) {
+      console.log(kleur.dim(`  ${error.stderr}`))
+    }
+    console.log('')
+    console.log(kleur.dim('  Create manually with:'))
+    console.log(kleur.dim(`  wrangler d1 create ${databaseName}`))
   }
 
   // Create R2 bucket
@@ -333,11 +602,23 @@ async function createCloudflareResources(databaseName, bucketName, targetDir) {
     await execa('wrangler', ['r2', 'bucket', 'create', bucketName], {
       cwd: targetDir
     })
+    bucketCreated = true
   } catch (error) {
-    console.log(kleur.yellow('  R2 bucket creation failed'))
+    console.log('')
+    console.log(kleur.yellow('⚠ R2 bucket creation failed:'))
+    console.log(kleur.dim(`  ${error.message}`))
+    if (error.stderr) {
+      console.log(kleur.dim(`  ${error.stderr}`))
+    }
+    console.log('')
+    console.log(kleur.dim('  Create manually with:'))
+    console.log(kleur.dim(`  wrangler r2 bucket create ${bucketName}`))
   }
 
-  return databaseId
+  return {
+    databaseId,
+    success: dbCreated && bucketCreated
+  }
 }
 
 async function updateWranglerConfig(targetDir, { databaseName, databaseId, bucketName }) {
@@ -396,8 +677,50 @@ async function initializeGit(targetDir) {
   }
 }
 
+async function runDatabaseMigrations(targetDir) {
+  try {
+    const { stdout, stderr } = await execa('npm', ['run', 'db:migrate:local'], {
+      cwd: targetDir,
+      reject: false // Don't reject on non-zero exit code - check manually
+    })
+
+    // Check if migrations were successful - look for actual errors, not warnings
+    if (stderr && (stderr.toLowerCase().includes('error:') || stderr.toLowerCase().includes('failed'))) {
+      // Filter out wrangler version warnings
+      if (!stderr.includes('Migrations were successfully applied')) {
+        throw new Error(stderr)
+      }
+    }
+
+    return stdout
+  } catch (error) {
+    throw new Error(`Migration failed: ${error.message}`)
+  }
+}
+
+async function seedAdminUser(targetDir) {
+  try {
+    const { stdout, stderr } = await execa('npm', ['run', 'seed'], {
+      cwd: targetDir,
+      reject: false // Don't reject on non-zero exit code - check manually
+    })
+
+    // Check if seeding was successful - look for actual errors, not warnings
+    if (stderr && (stderr.toLowerCase().includes('error:') || stderr.toLowerCase().includes('failed'))) {
+      // Filter out wrangler version warnings
+      if (!stdout.includes('Admin user created') && !stdout.includes('Admin user already exists')) {
+        throw new Error(stderr)
+      }
+    }
+
+    return stdout
+  } catch (error) {
+    throw new Error(`Seeding failed: ${error.message}`)
+  }
+}
+
 function printSuccessMessage(answers) {
-  const { projectName, createResources, skipInstall } = answers
+  const { projectName, createResources, skipInstall, resourcesCreated, databaseIdSet, migrationsRan, adminSeeded, seedAdmin } = answers
 
   console.log()
   console.log(kleur.bold().green('🎉 Success!'))
@@ -408,24 +731,57 @@ function printSuccessMessage(answers) {
 
   if (skipInstall) {
     console.log(kleur.cyan('  npm install'))
+    console.log()
+    console.log(kleur.yellow('⚠ Important: After npm install, copy migrations:'))
+    console.log(kleur.dim('  cp -r node_modules/@sonicjs-cms/core/migrations ./'))
   }
 
-  if (!createResources) {
+  // Show resource creation steps if they weren't created or failed
+  if (!createResources || !resourcesCreated) {
     console.log()
     console.log(kleur.bold('Create Cloudflare resources:'))
-    console.log(kleur.cyan(`  wrangler d1 create ${answers.databaseName}`))
-    console.log(kleur.dim('  # Copy database_id to wrangler.toml'))
+    if (!databaseIdSet) {
+      console.log(kleur.cyan(`  wrangler d1 create ${answers.databaseName}`))
+      console.log(kleur.dim('  # Copy database_id to wrangler.toml'))
+    }
     console.log(kleur.cyan(`  wrangler r2 bucket create ${answers.bucketName}`))
   }
 
-  console.log()
-  console.log(kleur.bold('Run migrations:'))
-  console.log(kleur.cyan('  npm run db:migrate:local'))
+  // Only show migration/seed steps if they weren't completed (shouldn't normally happen)
+  const needsMigrations = !migrationsRan
+  const needsSeeding = seedAdmin && !adminSeeded
+
+  if (needsMigrations || needsSeeding) {
+    console.log()
+    console.log(kleur.bold('Complete setup:'))
+    if (needsMigrations) {
+      console.log(kleur.cyan('  npm run db:migrate:local'))
+    }
+    if (needsSeeding) {
+      console.log(kleur.cyan('  npm run seed'))
+    }
+  }
 
   console.log()
-  console.log(kleur.bold('Start development:'))
+  if (migrationsRan && (!seedAdmin || adminSeeded)) {
+    console.log(kleur.bold().green('✓ Database is ready! Start development:'))
+  } else {
+    console.log(kleur.bold('Start development:'))
+  }
   console.log(kleur.cyan('  npm run dev'))
 
+  if (seedAdmin && answers.adminEmail) {
+    console.log()
+    console.log(kleur.bold('Login credentials:'))
+    console.log(kleur.cyan(`  Email: ${answers.adminEmail}`))
+    console.log(kleur.dim(`  Password: [as entered]`))
+  }
+
+  if (migrationsRan && (!seedAdmin || adminSeeded)) {
+    console.log()
+    console.log(kleur.green('✓ Everything is set up! Just run npm run dev and login.'))
+  }
+
   console.log()
   console.log(kleur.bold('Visit:'))
   console.log(kleur.cyan('  http://localhost:8787/admin'))

package/templates/starter/package.json

@@ -12,20 +12,21 @@
     "db:studio": "drizzle-kit studio",
     "type-check": "tsc --noEmit",
     "test": "vitest --run",
-    "test:watch": "vitest"
-  },
-  "dependencies": {
+    "test:watch": "vitest",
+    "update": "npm install @sonicjs-cms/core@latest --save",
+    "update:beta": "npm install @sonicjs-cms/core@beta --save"
   },
+  "dependencies": {},
   "devDependencies": {
-    "@cloudflare/workers-types": "^4.20250620.0",
-    "@types/node": "^20.19.1",
-    "drizzle-kit": "^0.30.0",
-    "drizzle-orm": "^0.44.2",
-    "hono": "^4.7.3",
-    "typescript": "^5.8.3",
-    "vitest": "^2.1.8",
-    "wrangler": "^3.110.0",
-    "zod": "^3.25.67"
+    "@cloudflare/workers-types": "^4.20251014.0",
+    "@types/node": "^24.9.2",
+    "drizzle-kit": "^0.30.3",
+    "drizzle-orm": "^0.44.7",
+    "hono": "^4.10.4",
+    "typescript": "^5.9.3",
+    "vitest": "^4.0.5",
+    "wrangler": "^3.110.4",
+    "zod": "^4.1.12"
   },
   "engines": {
     "node": ">=18.0.0"