chore: wip

chore: wip

chore: wip

Author: chrisbbreuer

.stacks/core/actions/src/dev/index.ts

@@ -1,5 +1,4 @@
 import { log } from '@stacksjs/logging'
-import { frameworkPath } from '@stacksjs/path'
 import { runCommand } from '@stacksjs/cli'
 import type { DevOptions } from '@stacksjs/types'
 import { Action, NpmScript } from '@stacksjs/types'

.stacks/core/actions/src/domains/add.ts

@@ -2,7 +2,6 @@ import process from 'node:process'
 import { createHostedZone } from '@stacksjs/dns'
 import { app } from '@stacksjs/config'
 import { handleError } from '@stacksjs/error-handling'
-import { projectStoragePath } from '@stacksjs/path'
 import { italic, parseOptions } from '@stacksjs/cli'
 import { whois } from '@stacksjs/whois'
 import { logger } from '@stacksjs/logging'

.stacks/core/actions/src/domains/remove.ts

@@ -35,6 +35,3 @@ if (result.isErr()) {
   handleError(result.error)
   process.exit(1)
 }
-
-logger.log('')
-logger.log('✅ Removed your domain')

.stacks/core/buddy/build.ts

@@ -1,6 +1,6 @@
 import { log, runCommand } from '@stacksjs/cli'
 
-const result = await runCommand('bun build ./src/index.ts ./src/cli.ts --outdir dist --format esm --target bun --external @stacksjs/actions --external @stacksjs/error-handling --external @stacksjs/cli --external @stacksjs/logging --external @stacksjs/utils --external @stacksjs/validation --external @stacksjs/path --external @stacksjs/storage --splitting --target bun', {
+const result = await runCommand('bun build ./src/index.ts ./src/cli.ts --outdir dist --format esm --target bun --external @stacksjs/actions --external @stacksjs/error-handling --external @stacksjs/cli --external @stacksjs/logging --external @stacksjs/utils --external @stacksjs/validation --external @stacksjs/path --external @stacksjs/storage --external @stacksjs/types --external @aws-sdk/client-route-53 --splitting --target bun', {
   cwd: import.meta.dir,
 })
 

.stacks/core/buddy/src/commands/deploy.ts

@@ -80,7 +80,7 @@ async function hasUserDomainBeenAddedToCloud(domainName?: string) {
   return false
 }
 
-async function addDomain(options: DeployOptions, startTime: number) {
+export async function addDomain(options: DeployOptions, startTime: number) {
   const result = await runAction(Action.DomainsAdd, options)
 
   if (result.isErr()) {

.stacks/core/buddy/src/commands/domains.ts

@@ -1,47 +1,61 @@
 import process from 'node:process'
 import type { CLI, DomainsOptions } from '@stacksjs/types'
 import { runAction } from '@stacksjs/actions'
-import { intro, outro } from '@stacksjs/cli'
-import { logger } from '@stacksjs/logging'
+import { config } from '@stacksjs/config'
+import { intro, outro, prompts } from '@stacksjs/cli'
 import { Action, ExitCode } from '@stacksjs/types'
+import { addDomain } from './deploy'
 
 export function domains(buddy: CLI) {
   const descriptions = {
     add: 'Add a domain to your cloud',
     remove: 'Remove a domain from your cloud',
+    skip: 'Skip the confirmation prompt',
     verbose: 'Enable verbose output',
   }
 
   buddy
     .command('domains:add <domain>', descriptions.add)
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: DomainsOptions) => {
-      const perf = await intro('buddy domains:add')
-      const result = await runAction(Action.DomainsAdd, options)
-
-      if (result.isErr()) {
-        await outro('While running the domains:add command, there was an issue', { startTime: perf, useSeconds: true, isError: true }, result.error)
-        process.exit(ExitCode.FatalError)
-      }
-
-      await outro('Added your domain.', { startTime: perf, useSeconds: true })
+      const startTime = await intro('buddy domains:add')
+      await addDomain(options, startTime)
       process.exit(ExitCode.Success)
     })
 
   buddy
     .command('domains:remove <domain>', descriptions.remove)
+    .option('--yes', descriptions.skip, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
-    // TODO: .option('--yes', 'Skip the confirmation prompt', { default: false })
-    .action(async (domain: string, options: DomainsOptions) => {
-      const perf = await intro('buddy domains:remove')
-      const result = await runAction(Action.DomainsRemove, { ...options, domain })
+    .action(async (options: DomainsOptions) => {
+      const domain = options.domain || config.app.url
+      const opts = { ...options, domain }
+      const startTime = await intro('buddy domains:remove')
+
+      // prompt for confirmation
+      if (!opts.yes) {
+        const { confirm } = await prompts({
+          name: 'confirm',
+          type: 'confirm',
+          message: `Are you sure you want to remove ${domain}?`,
+        })
+
+        console.log('confirm', confirm)
+
+        if (!confirm) {
+          await outro('Cancelled the domains:remove command', { startTime, useSeconds: true, type: 'info' })
+          process.exit(ExitCode.Success)
+        }
+      }
+
+      const result = await runAction(Action.DomainsRemove, opts)
 
       if (result.isErr()) {
-        await outro('While running the domains:remove command, there was an issue', { startTime: perf, useSeconds: true, isError: true }, result.error)
+        await outro('While running the domains:remove command, there was an issue', { startTime, useSeconds: true }, result.error)
         process.exit(ExitCode.FatalError)
       }
 
-      await outro('Removed your domain', { startTime: perf, useSeconds: true })
+      await outro('Removed your domain', { startTime, useSeconds: true })
       process.exit(ExitCode.Success)
     })
 }

.stacks/core/cli/src/console.ts

@@ -1,5 +1,3 @@
-/* eslint-disable @typescript-eslint/no-unsafe-argument */
-
 import { log } from '@stacksjs/logging'
 import prompts from 'prompts'
 

.stacks/core/cli/src/helpers.ts

@@ -4,7 +4,7 @@ import { handleError } from '@stacksjs/error-handling'
 import { log } from '@stacksjs/logging'
 import { version } from '../package.json'
 import { spinner } from './spinner'
-import { bgCyan, bold, cyan, dim, italic } from './utilities'
+import { bgCyan, bold, cyan, dim, gray, green, italic } from './utilities'
 
 /**
  * Prints the intro message.
@@ -30,21 +30,11 @@ export async function intro(command: string, options?: IntroOptions): Promise<nu
  * Prints the outro message.
  */
 export function outro(text: string, options: OutroOptions, error?: Error | string) {
-  const successMessage = options?.successMessage
+  const message = options?.message || text
 
   return new Promise((resolve) => {
-    if (options.isError) {
-      if (error)
-        handleError(error)
-    }
-    else {
-      if (options?.type === 'info')
-        log.info(text)
-
-      // the following condition triggers in the case of "Cleaned up" messages
-      if (options?.successMessage !== text)
-        log.success(text)
-    }
+    if (error)
+      handleError(error)
 
     if (options.startTime) {
       let time = performance.now() - options.startTime
@@ -57,10 +47,21 @@ export function outro(text: string, options: OutroOptions, error?: Error | strin
       if (options.quiet === true)
         return resolve(ExitCode.Success)
 
-      if (options.isError)
+      if (error)
         log.error(`[${time.toFixed(2)}${options.useSeconds ? 's' : 'ms'}] Failed`)
+      else if (options.type === 'info')
+        log.info(`${dim(gray(`[${time.toFixed(2)}${options.useSeconds ? 's' : 'ms'}]`))} ${message ?? 'Complete'}`)
       else
-        log.success((`[${time.toFixed(2)}${options.useSeconds ? 's' : 'ms'}] ${successMessage ?? 'Complete'}`))
+        log.info(`${dim(gray(bold(`[${time.toFixed(2)}${options.useSeconds ? 's' : 'ms'}]`)))} ${bold(green(message ?? 'Complete'))}`)
+    }
+
+    else {
+      if (options?.type === 'info')
+        log.info(text)
+
+      // the following condition triggers in the case of "Cleaned up" messages
+      else if (message !== text)
+        log.success(text)
     }
 
     return resolve(ExitCode.Success)

.stacks/core/dns/build.ts

@@ -1,6 +1,6 @@
 import { log, runCommand } from '@stacksjs/cli'
 
-const result = await runCommand('bun build ./src/index.ts --outdir dist --format esm --external aws-cdk-lib --external @aws-sdk/client-route-53 --external constructs --external @stacksjs/config --external @stacksjs/storage --target bun', {
+const result = await runCommand('bun build ./src/index.ts --outdir dist --format esm --external aws-cdk-lib --external @aws-sdk/client-route-53 --external constructs --external @stacksjs/config --external @stacksjs/storage --external @stacksjs/logging --external @stacksjs/path --external @stacksjs/error-handling --target bun', {
   cwd: import.meta.dir,
 })
 

.stacks/core/faker/build.ts

@@ -1,6 +1,6 @@
 import { log, runCommand } from '@stacksjs/cli'
 
-const result = await runCommand('bun build ./src/index.ts --outdir dist --format esm --external @stacksjs/cli --target bun', {
+const result = await runCommand('bun build ./src/index.ts --outdir dist --format esm --external @stacksjs/cli --external @faker-js/faker --target bun', {
   cwd: import.meta.dir,
 })