@stacksjs/buddy 0.59.10 → 0.61.0

package/src/commands/cloud.ts

@@ -1,6 +1,16 @@
 import process from 'node:process'
 import { intro, italic, log, outro, prompts, runCommand, runCommandSync, underline } from '@stacksjs/cli'
-import { addJumpBox, deleteCdkRemnants, deleteIamUsers, deleteJumpBox, deleteLogGroups, deleteParameterStore, deleteStacksBuckets, deleteStacksFunctions, getJumpBoxInstanceId } from '@stacksjs/cloud'
+import {
+  addJumpBox,
+  deleteCdkRemnants,
+  deleteIamUsers,
+  deleteJumpBox,
+  deleteLogGroups,
+  deleteParameterStore,
+  deleteStacksBuckets,
+  deleteStacksFunctions,
+  getJumpBoxInstanceId,
+} from '@stacksjs/cloud'
 import { path as p } from '@stacksjs/path'
 import type { CLI, CloudCliOptions } from '@stacksjs/types'
 import { ExitCode } from '@stacksjs/types'
@@ -22,7 +32,7 @@ export function cloud(buddy: CLI) {
     .command('cloud', descriptions.cloud)
     .option('--ssh', descriptions.ssh, { default: false })
     .option('--connect', descriptions.ssh, { default: false })
-    .option('-p, --project', descriptions.project, { default: false })
+    .option('-p, --project [project]', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: CloudCliOptions) => {
       log.debug('Running `buddy cloud` ...', options)
@@ -37,7 +47,11 @@ export function cloud(buddy: CLI) {
         })
 
         if (result.isErr()) {
-          await outro('While running the cloud command, there was an issue', { startTime, useSeconds: true }, result.error)
+          await outro(
+            'While running the cloud command, there was an issue',
+            { startTime, useSeconds: true },
+            result.error,
+          )
           process.exit(ExitCode.FatalError)
         }
 
@@ -52,7 +66,7 @@ export function cloud(buddy: CLI) {
   buddy
     .command('cloud:add', descriptions.add)
     .option('--jump-box', 'Remove the jump-box', { default: false })
-    .option('-p, --project', descriptions.project, { default: false })
+    .option('-p, --project [project]', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: CloudCliOptions) => {
       log.debug('Running `buddy cloud:add` ...', options)
@@ -74,21 +88,32 @@ export function cloud(buddy: CLI) {
         log.info('The jump-box is getting added to your cloud resources...')
         log.info('This takes a few moments, please be patient.')
         // sleep for 2 seconds to get the user to read the message
-        await new Promise(resolve => setTimeout(resolve, 2000))
+        await new Promise((resolve) => setTimeout(resolve, 2000))
 
         const result = await addJumpBox()
 
         if (result.isErr()) {
-          await outro('While running the cloud:add command, there was an issue', { startTime, useSeconds: true }, result.error)
+          await outro(
+            'While running the cloud:add command, there was an issue',
+            { startTime, useSeconds: true },
+            result.error,
+          )
           process.exit(ExitCode.FatalError)
         }
 
         log.info(italic('View the jump-box in the AWS console:'))
-        log.info(underline('https://us-east-1.console.aws.amazon.com/ec2/home?region=us-east-1#Instances:instanceState=running'))
+        log.info(
+          underline(
+            'https://us-east-1.console.aws.amazon.com/ec2/home?region=us-east-1#Instances:instanceState=running',
+          ),
+        )
         log.info(italic('Once it finished initializing, you may SSH into it:'))
-        log.info(underline(('buddy cloud --ssh')))
+        log.info(underline('buddy cloud --ssh'))
 
-        await outro('Your jump-box was added.', { startTime, useSeconds: true })
+        await outro('Your jump-box was added.', {
+          startTime,
+          useSeconds: true,
+        })
         process.exit(ExitCode.Success)
       }
 
@@ -103,7 +128,7 @@ export function cloud(buddy: CLI) {
     .alias('undeploy')
     .option('--jump-box', 'Remove the jump-box', { default: false })
     // .option('--realtime-cdn-logs', 'Remove the CDN Realtime Log Stream', { default: false }) // TODO: implement this
-    .option('-p, --project', descriptions.project, { default: false })
+    .option('-p, --project [project]', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: CloudCliOptions) => {
       log.debug('Running `buddy cloud:remove` ...', options)
@@ -129,19 +154,19 @@ export function cloud(buddy: CLI) {
           process.exit(ExitCode.FatalError)
         }
 
-        await outro('Your jump-box was removed.', { startTime, useSeconds: true })
+        await outro('Your jump-box was removed.', {
+          startTime,
+          useSeconds: true,
+        })
         process.exit(ExitCode.Success)
       }
 
-      // eslint-disable-next-line no-console
       console.log(`   ${italic('ℹ️   Removing your cloud resources takes a while to complete.')}`)
-      // eslint-disable-next-line no-console
       console.log(`   ${italic('Please note, your backups will not yet be deleted. Though,')}`)
-      // eslint-disable-next-line no-console
       console.log(`   ${italic('Backups are scheduled to delete themselves in 30 days.')}`)
 
       // sleep for 2 seconds to get the user to read the message
-      await new Promise(resolve => setTimeout(resolve, 2000))
+      await new Promise((resolve) => setTimeout(resolve, 2000))
 
       const result = await runCommand(`bunx cdk destroy`, {
         ...options,
@@ -150,7 +175,11 @@ export function cloud(buddy: CLI) {
       })
 
       if (result.isErr()) {
-        await outro('While running the cloud:remove ("undeploy") command, there was an issue', { startTime, useSeconds: true }, result.error)
+        await outro(
+          'While running the cloud:remove ("undeploy") command, there was an issue',
+          { startTime, useSeconds: true },
+          result.error,
+        )
         process.exit(ExitCode.FatalError)
       }
 
@@ -175,10 +204,12 @@ export function cloud(buddy: CLI) {
           })
         })
 
-        await outro('Your cloud has been removed', { startTime, useSeconds: true })
+        await outro('Your cloud has been removed', {
+          startTime,
+          useSeconds: true,
+        })
         process.exit(ExitCode.Success)
-      }
-      catch (error) {
+      } catch (error) {
         await outro('While cleaning up the cloud, there was an issue', { startTime, useSeconds: true }, error as Error)
         process.exit(ExitCode.FatalError)
       }
@@ -188,7 +219,7 @@ export function cloud(buddy: CLI) {
     .command('cloud:optimize-cost', descriptions.optimizeCost)
     .option('--jump-box', 'Remove the jump-box', { default: true }) // removes the ec2 instance
     // .option('--realtime-cdn-logs', 'Remove the CDN Realtime Log Stream', { default: true }) // TODO: implement this - removes the Kinesis Data Stream
-    .option('-p, --project', descriptions.project, { default: false })
+    .option('-p, --project [project]', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: CloudCliOptions) => {
       log.debug('Running `buddy cloud:optimize-cost` ...', options)
@@ -215,14 +246,17 @@ export function cloud(buddy: CLI) {
         process.exit(ExitCode.Success)
       }
 
-      await outro('No cost optimization was applied', { startTime, useSeconds: true })
+      await outro('No cost optimization was applied', {
+        startTime,
+        useSeconds: true,
+      })
       process.exit(ExitCode.Success)
     })
 
   buddy
     .command('cloud:cleanup', descriptions.cleanUp)
     .alias('cloud:clean-up')
-    .option('-p, --project', descriptions.project, { default: false })
+    .option('-p, --project [project]', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: CloudCliOptions) => {
       log.debug('Running `buddy cloud:cleanup` ...', options)
@@ -232,7 +266,7 @@ export function cloud(buddy: CLI) {
       log.info(`Cleaning up your cloud resources will take a while to complete. Please be patient.`)
 
       // sleep for 2 seconds to get the user to read the message
-      await new Promise(resolve => setTimeout(resolve, 2000))
+      await new Promise((resolve) => setTimeout(resolve, 2000))
 
       log.info('Removing any jump-boxes...')
       const result = await deleteJumpBox()
@@ -248,7 +282,11 @@ export function cloud(buddy: CLI) {
       const result2 = await deleteStacksBuckets()
 
       if (result2.isErr()) {
-        await outro('While deleting the retained S3 buckets, there was an issue', { startTime, useSeconds: true }, result2.error)
+        await outro(
+          'While deleting the retained S3 buckets, there was an issue',
+          { startTime, useSeconds: true },
+          result2.error,
+        )
         process.exit(ExitCode.FatalError)
       }
 
@@ -257,7 +295,11 @@ export function cloud(buddy: CLI) {
 
       if (result3.isErr()) {
         if (result3.error !== 'No stacks functions found')
-          await outro('While deleting the Origin Request Lambda function, there was an issue', { startTime, useSeconds: true }, result3.error)
+          await outro(
+            'While deleting the Origin Request Lambda function, there was an issue',
+            { startTime, useSeconds: true },
+            result3.error,
+          )
 
         process.exit(ExitCode.FatalError)
       }
@@ -269,7 +311,11 @@ export function cloud(buddy: CLI) {
       // TODO: investigate other regions for edge (cloudfront) logs
 
       if (result4.isErr()) {
-        await outro('While deleting the Stacks log groups, there was an issue', { startTime, useSeconds: true }, result4.error)
+        await outro(
+          'While deleting the Stacks log groups, there was an issue',
+          { startTime, useSeconds: true },
+          result4.error,
+        )
         process.exit(ExitCode.FatalError)
       }
 
@@ -285,7 +331,11 @@ export function cloud(buddy: CLI) {
       const result7 = await deleteParameterStore()
 
       if (result7.isErr()) {
-        await outro('While deleting the Stacks log groups, there was an issue', { startTime, useSeconds: true }, result7.error)
+        await outro(
+          'While deleting the Stacks log groups, there was an issue',
+          { startTime, useSeconds: true },
+          result7.error,
+        )
         process.exit(ExitCode.FatalError)
       }
 
@@ -293,7 +343,11 @@ export function cloud(buddy: CLI) {
       const result6 = await deleteCdkRemnants()
 
       if (result6.isErr()) {
-        await outro('While deleting the Stacks log groups, there was an issue', { startTime, useSeconds: true }, result6.error)
+        await outro(
+          'While deleting the Stacks log groups, there was an issue',
+          { startTime, useSeconds: true },
+          result6.error,
+        )
         process.exit(ExitCode.FatalError)
       }
 
@@ -301,14 +355,21 @@ export function cloud(buddy: CLI) {
       const result8 = await deleteIamUsers()
 
       if (result8.isErr()) {
-        await outro('While deleting the Stacks log groups, there was an issue', { startTime, useSeconds: true }, result8.error)
+        await outro(
+          'While deleting the Stacks log groups, there was an issue',
+          { startTime, useSeconds: true },
+          result8.error,
+        )
         process.exit(ExitCode.FatalError)
       }
 
       // TODO: needs to delete all Backup Vaults
       // TODO: needs to delete all KMS keys
 
-      await outro('AWS resources have been removed', { startTime, useSeconds: true })
+      await outro('AWS resources have been removed', {
+        startTime,
+        useSeconds: true,
+      })
       process.exit(ExitCode.Success)
     })
 

package/src/commands/commit.ts

@@ -1,7 +1,7 @@
 import process from 'node:process'
-import type { CLI, FreshOptions } from '@stacksjs/types'
 import { runCommit } from '@stacksjs/actions'
 import { log } from '@stacksjs/logging'
+import type { CLI, FreshOptions } from '@stacksjs/types'
 
 export function commit(buddy: CLI) {
   const descriptions = {
@@ -12,7 +12,7 @@ export function commit(buddy: CLI) {
 
   buddy
     .command('commit', descriptions.commit)
-    .option('-p, --project', descriptions.project, { default: false })
+    .option('-p, --project [project]', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: FreshOptions) => {
       log.debug('Running `buddy commit` ...', options)

package/src/commands/configure.ts

@@ -1,7 +1,7 @@
 import process from 'node:process'
-import type { CLI, ConfigureOptions } from '@stacksjs/types'
 import { log, outro, runCommand } from '@stacksjs/cli'
 import { path as p } from '@stacksjs/path'
+import type { CLI, ConfigureOptions } from '@stacksjs/types'
 import { ExitCode } from '@stacksjs/types'
 
 export function configure(buddy: CLI) {
@@ -16,7 +16,7 @@ export function configure(buddy: CLI) {
   buddy
     .command('configure', descriptions.configure)
     .option('--aws', descriptions.aws, { default: false })
-    .option('-p, --project', descriptions.project, { default: false })
+    .option('-p, --project [project]', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options?: ConfigureOptions) => {
       log.debug('Running `buddy configure` ...', options)
@@ -32,8 +32,10 @@ export function configure(buddy: CLI) {
 
   buddy
     .command('configure:aws', descriptions.aws)
-    .option('-p, --project', descriptions.project, { default: false })
-    .option('--profile', descriptions.profile, { default: process.env.AWS_PROFILE })
+    .option('-p, --project [project]', descriptions.project, { default: false })
+    .option('--profile', descriptions.profile, {
+      default: process.env.AWS_PROFILE,
+    })
     .option('--verbose', descriptions.verbose, { default: false })
     .option('--access-key-id', 'The AWS access key')
     .option('--secret-access-key', 'The AWS secret access key')
@@ -64,7 +66,6 @@ async function configureAws(options?: ConfigureOptions) {
   const input = `${awsAccessKeyId}\n${awsSecretAccessKey}\n${defaultRegion}\n${defaultOutputFormat}\n`
 
   const result = await runCommand(command, {
-    ...options,
     cwd: p.projectPath(),
     stdin: 'pipe', // set stdin mode to 'pipe' to write to it
     input, // the actual input to write
@@ -75,8 +76,7 @@ async function configureAws(options?: ConfigureOptions) {
     process.exit(ExitCode.FatalError)
   }
 
-  if (options?.quiet)
-    return
+  if (options?.quiet) return
 
   await outro('Exited', { startTime, useSeconds: true })
 }

package/src/commands/create.ts

@@ -1,15 +1,16 @@
 import process from 'node:process'
+import { runAction } from '@stacksjs/actions'
+import { bold, cyan, dim, intro, log, runCommand } from '@stacksjs/cli'
+import { Action } from '@stacksjs/enums'
+import { resolve } from '@stacksjs/path'
+import { isFolder } from '@stacksjs/storage'
 import { ExitCode } from '@stacksjs/types'
 import type { CLI, CreateOptions } from '@stacksjs/types'
-import { bold, cyan, dim, intro, log, runCommand } from '@stacksjs/cli'
 import { useOnline } from '@stacksjs/utils'
-import { isFolder } from '@stacksjs/storage'
-import { resolve } from '@stacksjs/path'
-import { Action } from '@stacksjs/enums'
-import { runAction } from '@stacksjs/actions'
 
 export function create(buddy: CLI) {
   const descriptions = {
+    name: 'The name of the project',
     command: 'Create a new Stacks project',
     ui: 'Are you building a UI?',
     components: 'Are you building UI components?',
@@ -27,8 +28,9 @@ export function create(buddy: CLI) {
   }
 
   buddy
-    .command('new <name>', descriptions.command)
-    .alias('create <name>')
+    .command('new [name]', descriptions.command)
+    .alias('create [name]')
+    .option('-n, --name [name]', descriptions.name, { default: false })
     .option('-u, --ui', descriptions.ui, { default: true }) // if no, disregard remainder of questions wrt UI
     .option('-c, --components', descriptions.components, { default: true }) // if no, -v and -w would be false
     .option('-w, --web-components', descriptions.webComponents, { default: true })
@@ -39,18 +41,20 @@ export function create(buddy: CLI) {
     .option('-d, --database', descriptions.database, { default: true })
     .option('-ca, --cache', descriptions.cache, { default: false })
     .option('-e, --email', descriptions.email, { default: false })
-    .option('-p, --project', descriptions.project, { default: false })
+    .option('-p, --project [project]', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     // .option('--auth', 'Scaffold an authentication?', { default: true })
-    .action(async (options: CreateOptions) => {
+    .action(async (name, options: CreateOptions) => {
       log.debug('Running `buddy new <name>` ...', options)
 
       const startTime = await intro('stacks new')
-      const name = options.name
+
+      name = name ?? options.name
       const path = resolve(process.cwd(), name)
 
       isFolderCheck(path)
       onlineCheck()
+
       const result = await download(name, path, options)
 
       if (result.isErr()) {

package/src/commands/deploy.ts

@@ -1,12 +1,11 @@
-/* eslint-disable no-console */
 import process from 'node:process'
-import { ExitCode } from '@stacksjs/types'
-import type { CLI, DeployOptions } from '@stacksjs/types'
 import { runAction } from '@stacksjs/actions'
 import { intro, italic, log, outro, runCommand } from '@stacksjs/cli'
-import { Action } from '@stacksjs/enums'
 import { app } from '@stacksjs/config'
 import { addDomain, hasUserDomainBeenAddedToCloud } from '@stacksjs/dns'
+import { Action } from '@stacksjs/enums'
+import { ExitCode } from '@stacksjs/types'
+import type { CLI, DeployOptions } from '@stacksjs/types'
 
 export function deploy(buddy: CLI) {
   const descriptions = {
@@ -18,7 +17,7 @@ export function deploy(buddy: CLI) {
   buddy
     .command('deploy', descriptions.deploy)
     .option('--domain', 'Specify a domain to deploy to', { default: undefined })
-    .option('-p, --project', descriptions.project, { default: false })
+    .option('-p, --project [project]', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: DeployOptions) => {
       log.debug('Running `buddy deploy` ...', options)
@@ -33,6 +32,8 @@ export function deploy(buddy: CLI) {
         process.exit(ExitCode.FatalError)
       }
 
+      log.info(`Deploying to ${italic(domain)}`)
+
       await checkIfAwsIsConfigured()
 
       options.domain = await configureDomain(domain, options, startTime)
@@ -40,7 +41,11 @@ export function deploy(buddy: CLI) {
       const result = await runAction(Action.Deploy, options)
 
       if (result.isErr()) {
-        await outro('While running the `buddy deploy`, there was an issue', { startTime, useSeconds: true }, result.error)
+        await outro(
+          'While running the `buddy deploy`, there was an issue',
+          { startTime, useSeconds: true },
+          result.error,
+        )
         process.exit(ExitCode.FatalError)
       }
 
@@ -56,8 +61,7 @@ export function deploy(buddy: CLI) {
 async function configureDomain(domain: string, options: DeployOptions, startTime: number) {
   if (!domain) {
     log.info('We could not identify a domain to deploy to.')
-    log.info('Please set your .env or ./config/app.ts properly.')
-    console.log('')
+    log.warn('Please set your .env or ./config/app.ts properly.')
     log.info('Alternatively, specify a domain to deploy via the `--domain` flag.')
     console.log('')
     log.info('   ➡️  Example: `buddy deploy --domain example.com`')
@@ -69,8 +73,9 @@ async function configureDomain(domain: string, options: DeployOptions, startTime
   // TODO: add check for whether the local APP_ENV is getting deployed, if so, ask if the user meant to deploy `dev`
   if (domain.includes('localhost')) {
     log.info('You are deploying to a local environment.')
-    log.info('Please set your .env or ./config/app.ts properly. The domain we are deploying cannot be a `localhost` domain.')
-    console.log('')
+    log.warn(
+      'Please set your .env or ./config/app.ts properly. The domain we are deploying cannot be a `localhost` domain.',
+    )
     log.info('Alternatively, specify a domain to deploy via the `--domain` flag.')
     console.log('')
     log.info('   ➡️  Example: `buddy deploy --domain example.com`')