pagezero 0.3.0 → 0.4.1

package/bin/pagezero.ts

@@ -1,12 +1,8 @@
 #!/usr/bin/env bun
 
-import { confirm, input } from "@inquirer/prompts"
-import boxen from "boxen"
-import { $, file, write } from "bun"
-import chalk from "chalk"
 import { program } from "commander"
-import logSymbols from "log-symbols"
-import ora from "ora"
+import { init } from "../src/commands/init"
+import { upgrade } from "../src/commands/upgrade"
 
 program
   .description("PageZERO CLI")
@@ -17,114 +13,3 @@ program.command("init").description("initialize a new project").action(init)
 program.command("upgrade").description("upgrade pagezero stack").action(upgrade)
 
 program.parse()
-
-async function init() {
-  // Welcome
-  console.log(chalk.green("👋 Welcome to PageZERO CLI"))
-  console.log(chalk.green("🚀 Let's get you started with your project!"))
-
-  // Bootstrap the project
-  const projectName = await input({
-    message: "What is the name of your project?",
-  })
-  const creatingProjectSpinner = ora(
-    `Running: bun create pagezero-dev/pagezero --no-install ${projectName}`,
-  ).start()
-  await $`bun create pagezero-dev/pagezero --no-install ${projectName}`.quiet()
-  creatingProjectSpinner.succeed()
-
-  // Install dependencies
-  const installingDependenciesSpinner = ora(`Running: bun install`).start()
-  await $`bun install`.quiet().cwd(projectName)
-  installingDependenciesSpinner.succeed()
-
-  // Run setup script
-  const runningSetupScriptSpinner = ora(`Running: bun run setup`).start()
-  await $`bun run setup`.quiet().cwd(projectName)
-  runningSetupScriptSpinner.succeed()
-
-  // Update wrangler.json
-  const updatingWranglerJsonSpinner = ora(`Updating wrangler.json`).start()
-  try {
-    const wranglerJson = await file(`${projectName}/wrangler.json`).json()
-    wranglerJson.name = projectName
-    wranglerJson.d1_databases[0].database_name = `${projectName}-development`
-    wranglerJson.env.production.d1_databases[0].database_name = `${projectName}-production`
-    wranglerJson.env.preview.d1_databases[0].database_name = `${projectName}-preview`
-    wranglerJson.env.test.d1_databases[0].database_name = `${projectName}-test`
-    wranglerJson.env.production.d1_databases[0].database_id = "<DATABASE_ID>"
-    wranglerJson.env.preview.d1_databases[0].database_id = "<DATABASE_ID>"
-    await write(
-      `${projectName}/wrangler.json`,
-      JSON.stringify(wranglerJson, null, 2),
-    )
-    updatingWranglerJsonSpinner.succeed()
-  } catch (error) {
-    updatingWranglerJsonSpinner.warn()
-    console.error(chalk.yellow("Issue with updating wrangler.json"))
-    if (error instanceof Error) {
-      console.error(chalk.yellow(error.message))
-    }
-  }
-
-  // Done
-  console.log(chalk.green("🎉 Done! Your project is ready to go."))
-  console.log(chalk.green.bold(`cd ${projectName}`))
-  console.log(chalk.green.bold("bun run dev"))
-}
-
-async function upgrade() {
-  console.log(
-    chalk.yellow(
-      boxen(
-        "Ugrade command is primitive. It will overwrite your existing \nproject files with the latest version of the PageZERO stack. \nAfterwards please review the changes through a git diff.",
-        { padding: 1, title: "WARNING", titleAlignment: "center" },
-      ),
-    ),
-  )
-
-  const shouldProceed = await confirm({
-    message: "Do you want to proceed?",
-  })
-
-  if (!shouldProceed) {
-    return
-  }
-
-  const rsync = await $`command -v rsync`.quiet()
-  if (rsync.stdout) {
-    console.log(`${logSymbols.success} rsync is installed`)
-  } else {
-    console.log(
-      `${logSymbols.error} rsync is not installed and is required for the upgrade command: please install it and try again`,
-    )
-    return
-  }
-
-  const wranglerFile = file(`wrangler.json`)
-  if (await wranglerFile.exists()) {
-    console.log(`${logSymbols.success} wrangler.json file found`)
-  } else {
-    console.log(
-      `${logSymbols.error} wrangler.json file not found: please run command within PageZERO project directory`,
-    )
-    return
-  }
-
-  const clonePagezeroSpinner = ora(`downloading latest PageZERO stack`).start()
-  await $`git clone --depth 1 https://github.com/pagezero-dev/pagezero.git pagezero-latest`.quiet()
-  clonePagezeroSpinner.succeed()
-
-  const copyPagezeroSpinner = ora(
-    `copying PageZERO stack to project directory`,
-  ).start()
-  await $`rsync -a --exclude=".git" ./pagezero-latest/ ./`.quiet()
-  copyPagezeroSpinner.succeed()
-
-  const cleanupSpinner = ora(`cleaning up`).start()
-  await $`rm -rf pagezero-latest`.quiet()
-  cleanupSpinner.succeed()
-
-  console.log(chalk.green("PageZERO stack upgraded successfully"))
-  console.log(chalk.green.bold("Please review the changes through a git diff"))
-}

package/package.json

@@ -6,10 +6,11 @@
     "pagezero": "./bin/pagezero.ts"
   },
   "files": [
-    "bin/"
+    "bin/",
+    "src/"
   ],
   "engines": {
-    "bun": ">=1.2.20"
+    "bun": ">=1.3.1"
   },
   "keywords": [
     "cli",
@@ -32,19 +33,19 @@
     "check:types": "tsc"
   },
   "devDependencies": {
-    "@biomejs/biome": "2.2.4",
-    "@types/bun": "1.2.20"
+    "@biomejs/biome": "2.3.3",
+    "@types/bun": "1.3.1"
   },
   "peerDependencies": {
-    "typescript": "^5"
+    "typescript": "^5.9.3"
   },
   "dependencies": {
-    "@inquirer/prompts": "7.8.6",
+    "@inquirer/prompts": "7.9.0",
     "boxen": "8.0.1",
     "chalk": "5.6.2",
-    "commander": "14.0.1",
+    "commander": "14.0.2",
     "log-symbols": "7.0.1",
     "ora": "9.0.0"
   },
-  "version": "0.3.0"
+  "version": "0.4.1"
 }

package/src/commands/init.ts

@@ -0,0 +1,51 @@
+import { input } from "@inquirer/prompts"
+import { $, file, write } from "bun"
+import chalk from "chalk"
+import { spinner } from "../utils"
+
+export async function init() {
+  // Welcome
+  console.log(chalk.green("👋 Welcome to PageZERO CLI"))
+  console.log(chalk.green("🚀 Let's get you started with your project!"))
+
+  // Bootstrap the project
+  const projectName = await input({
+    message: "What is the name of your project?",
+  })
+  await spinner(
+    `Running: bun create pagezero-dev/pagezero --no-install ${projectName}`,
+    () =>
+      $`bun create pagezero-dev/pagezero --no-install ${projectName}`.quiet(),
+  )
+
+  // Install dependencies
+  await spinner(`Running: bun install`, () =>
+    $`bun install`.quiet().cwd(projectName),
+  )
+
+  // Run setup script
+  await spinner(`Running: bun run setup`, () =>
+    $`bun run setup`.quiet().cwd(projectName),
+  )
+
+  // Update wrangler.json
+  await spinner(`Updating wrangler.json`, async () => {
+    const wranglerJson = await file(`${projectName}/wrangler.json`).json()
+    wranglerJson.name = projectName
+    wranglerJson.d1_databases[0].database_name = `${projectName}-development`
+    wranglerJson.env.production.d1_databases[0].database_name = `${projectName}-production`
+    wranglerJson.env.preview.d1_databases[0].database_name = `${projectName}-preview`
+    wranglerJson.env.test.d1_databases[0].database_name = `${projectName}-test`
+    wranglerJson.env.production.d1_databases[0].database_id = "<DATABASE_ID>"
+    wranglerJson.env.preview.d1_databases[0].database_id = "<DATABASE_ID>"
+    await write(
+      `${projectName}/wrangler.json`,
+      JSON.stringify(wranglerJson, null, 2),
+    )
+  })
+
+  // Done
+  console.log(chalk.green("🎉 Done! Your project is ready to go."))
+  console.log(chalk.green.bold(`cd ${projectName}`))
+  console.log(chalk.green.bold("bun run dev"))
+}

package/src/commands/upgrade.ts

@@ -0,0 +1,58 @@
+import { confirm } from "@inquirer/prompts"
+import boxen from "boxen"
+import { $, file } from "bun"
+import chalk from "chalk"
+import logSymbols from "log-symbols"
+import { spinner } from "../utils"
+
+export async function upgrade() {
+  console.log(
+    chalk.yellow(
+      boxen(
+        "Ugrade command is primitive. It will overwrite your existing \nproject files with the latest version of the PageZERO stack. \nAfterwards please review the changes through a git diff.",
+        { padding: 1, title: "WARNING", titleAlignment: "center" },
+      ),
+    ),
+  )
+
+  const shouldProceed = await confirm({
+    message: "Do you want to proceed?",
+  })
+
+  if (!shouldProceed) {
+    return
+  }
+
+  const rsync = await $`command -v rsync`.quiet()
+  if (rsync.stdout) {
+    console.log(`${logSymbols.success} rsync is installed`)
+  } else {
+    console.log(
+      `${logSymbols.error} rsync is not installed and is required for the upgrade command: please install it and try again`,
+    )
+    return
+  }
+
+  const wranglerFile = file(`wrangler.json`)
+  if (await wranglerFile.exists()) {
+    console.log(`${logSymbols.success} wrangler.json file found`)
+  } else {
+    console.log(
+      `${logSymbols.error} wrangler.json file not found: please run command within PageZERO project directory`,
+    )
+    return
+  }
+
+  await spinner(`downloading latest PageZERO stack`, () =>
+    $`git clone --depth 1 https://github.com/pagezero-dev/pagezero.git pagezero-latest`.quiet(),
+  )
+
+  await spinner(`copying PageZERO stack to project directory`, () =>
+    $`rsync -a --exclude=".git" ./pagezero-latest/ ./`.quiet(),
+  )
+
+  await spinner(`cleaning up`, () => $`rm -rf pagezero-latest`.quiet())
+
+  console.log(chalk.green("PageZERO stack upgraded successfully"))
+  console.log(chalk.green.bold("Please review the changes through a git diff"))
+}

package/src/utils.ts

@@ -0,0 +1,15 @@
+import ora, { type Ora } from "ora"
+
+export async function spinner(
+  message: string,
+  fn: (spinner: Ora) => Promise<unknown>,
+) {
+  const spinner = ora(message).start()
+  try {
+    await fn(spinner)
+    spinner.succeed()
+  } catch (error) {
+    spinner.fail()
+    throw error
+  }
+}