stacks 0.64.6 → 0.65.0

package/buddy/bin/cli.ts

@@ -13,7 +13,8 @@ cli
   .action(() => {
     const buddyCli = 'buddy'
 
-    if (existsSync(buddyCli)) $`${buddyCli} ${process.argv.slice(2).join(' ')}`
+    if (existsSync(buddyCli))
+      $`${buddyCli} ${process.argv.slice(2).join(' ')}`
 
     let currentDir = process.cwd()
     let found = false
@@ -33,7 +34,7 @@ cli
       process.exit(1)
     }
 
-    $`bunx stacks new ${process.argv.slice(2).join(' ')}`
+    $`bunx --bun stacks new ${process.argv.slice(2).join(' ')}`
   })
 
 cli
@@ -52,7 +53,8 @@ cli
           const isDirectory = statSync(contentPath).isDirectory()
 
           if (isDirectory) {
-            if (contentPath.includes(target)) return contentPath // Found the target directory
+            if (contentPath.includes(target))
+              return contentPath // Found the target directory
 
             queue.push(contentPath)
           }
@@ -68,7 +70,8 @@ cli
       console.log(`Project found at ${projectPath}.`)
       console.log(`Run 'cd ${projectPath}' to navigate to the project directory.`)
       // $`cd ${projectPath}`
-    } else {
+    }
+    else {
       console.error('Project directory not found.')
     }
   })

package/buddy/build.ts

@@ -1,3 +1,4 @@
+import { dts } from 'bun-plugin-dts-auto'
 import { intro, outro } from '../build/src'
 
 const { startTime } = await intro({
@@ -31,6 +32,8 @@ const result = await Bun.build({
     '@stacksjs/types',
     'bun',
   ],
+
+  plugins: [dts({ root: './src', outdir: './dist' })],
 })
 
 await outro({

package/buddy/package.json

@@ -1,9 +1,10 @@
 {
   "name": "@stacksjs/buddy",
   "type": "module",
-  "version": "0.64.6",
+  "version": "0.65.0",
   "description": "Meet Buddy. The Stacks runtime.",
   "author": "Chris Breuer",
+  "contributors": ["Chris Breuer <chris@stacksjs.org>"],
   "license": "MIT",
   "funding": "https://github.com/sponsors/chrisbbreuer",
   "homepage": "https://github.com/stacksjs/stacks/tree/main/stacks#readme",
@@ -50,7 +51,6 @@
   },
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
-  "contributors": ["Chris Breuer <chris@stacksjs.org>"],
   "bin": {
     "stacks": "dist/cli.mjs",
     "stx": "dist/cli.mjs",
@@ -59,8 +59,8 @@
   },
   "files": ["README.md", "dist", "src"],
   "scripts": {
-    "buddy": "bunx ./src/cli.ts",
-    "build": "bun --bun build.ts && bun run compile",
+    "buddy": "bunx --bun ./src/cli.ts",
+    "build": "bun build.ts && bun run compile",
     "compile": "bun build ./bin/cli.ts --compile --minify --sourcemap --outfile dist/stacks",
     "compile:linux:x64-modern": "bun build ./bin/cli.ts --compile --target=bun-linux-x64-modern --minify --sourcemap --outfile dist/stacks",
     "compile:linux:x64-baseline": "bun build ./bin/cli.ts --compile --target=bun-linux-x64-baseline --minify --sourcemap --outfile dist/stacks",
@@ -69,7 +69,7 @@
     "compile:windows:x64-baseline": "bun build ./bin/cli.ts --compile --target=bun-windows-x64-baseline --minify --sourcemap --outfile dist/stacks",
     "compile:mac:arm64": "bun build ./bin/cli.ts --compile --target=bun-darwin-arm64 --minify --sourcemap --outfile dist/stacks",
     "compile:mac:x64": "bun build ./bin/cli.ts --compile --target=bun-darwin-x64 --minify --sourcemap --outfile dist/stacks",
-    "typecheck": "bun --bun tsc --noEmit",
+    "typecheck": "bun tsc --noEmit",
     "prepublishOnly": "bun run build"
   },
   "dependencies": {

package/buddy/src/cli.ts

@@ -1,6 +1,6 @@
+import type { CAC } from '@stacksjs/cli'
 import process from 'node:process'
 import { runAction } from '@stacksjs/actions'
-import type { CAC } from '@stacksjs/cli'
 import { cli, log } from '@stacksjs/cli'
 import { Action } from '@stacksjs/enums'
 import { path as p } from '@stacksjs/path'
@@ -10,13 +10,13 @@ import * as cmd from './commands'
 
 // setup global error handlers
 process.on('uncaughtException', (error: Error) => {
-  log.debug('uncaughtException')
+  log.debug('Buddy uncaughtException')
   log.error(error)
   process.exit(1)
 })
 
 process.on('unhandledRejection', (error: Error) => {
-  log.debug('unhandledRejection', error)
+  log.debug('Buddy unhandledRejection')
   log.error(error)
   process.exit(1)
 })
@@ -32,7 +32,8 @@ async function main() {
   const isAppKeySet = await ensureProjectIsInitialized()
   if (isAppKeySet) {
     log.debug('Project is initialized')
-  } else {
+  }
+  else {
     log.info('Your `APP_KEY` is not yet set')
     log.info('Generating application key...')
     const result = await runAction(Action.KeyGenerate)
@@ -86,17 +87,19 @@ await main()
 async function dynamicImports(buddy: CAC) {
   // dynamically import and register commands from ./app/Commands/*
   const commandsDir = p.appPath('Commands')
-  const commandFiles = fs.readdirSync(commandsDir).filter((file) => file.endsWith('.ts'))
+  const commandFiles = fs.readdirSync(commandsDir).filter((file: string) => file.endsWith('.ts'))
 
   for (const file of commandFiles) {
     const commandPath = `${commandsDir}/${file}`
     const dynamicImport = await import(commandPath)
 
     // Correctly use the default export function
-    if (typeof dynamicImport.default === 'function') dynamicImport.default(buddy)
+    if (typeof dynamicImport.default === 'function')
+      dynamicImport.default(buddy)
     else console.error(`Expected a default export function in ${file}, but got:`, dynamicImport.default)
   }
 
   const listenerImport = await import(p.listenersPath('Console.ts'))
-  if (typeof listenerImport.default === 'function') listenerImport.default(buddy)
+  if (typeof listenerImport.default === 'function')
+    listenerImport.default(buddy)
 }

package/buddy/src/commands/add.ts

@@ -1,10 +1,10 @@
+import type { AddOptions, BuildOptions, CLI } from '@stacksjs/types'
 import process from 'node:process'
 import { runAdd } from '@stacksjs/actions'
 import { log } from '@stacksjs/logging'
-import type { AddOptions, BuildOptions, CLI } from '@stacksjs/types'
 import { ExitCode } from '@stacksjs/types'
 
-export function add(buddy: CLI) {
+export function add(buddy: CLI): void {
   const descriptions = {
     add: 'Add a stack to your project (coming soon)',
     table: 'Add the Table Stack to your project',

package/buddy/src/commands/build.ts

@@ -1,12 +1,11 @@
+import type { BuildOptions, CLI } from '@stacksjs/types'
 import process from 'node:process'
 import { runAction } from '@stacksjs/actions'
-import { intro, log, outro } from '@stacksjs/cli'
+import { intro, log, outro, prompts } from '@stacksjs/cli'
 import { Action } from '@stacksjs/enums'
-import type { BuildOptions, CLI } from '@stacksjs/types'
 import { ExitCode } from '@stacksjs/types'
-import { isString } from '@stacksjs/validation'
 
-export function build(buddy: CLI) {
+export function build(buddy: CLI): void {
   const descriptions = {
     build: 'Build any of your libraries (packages) for production use',
     components: 'Build your component library',
@@ -73,38 +72,57 @@ export function build(buddy: CLI) {
           options.stacks = true
           break
         case 'server':
-          options.stacks = true
+          options.server = true
           break
         default:
           break
       }
 
+      console.log('server', server, options)
+
       // TODO: uncomment this when prompt is available
       if (hasNoOptions(options)) {
-        let answers = await log.prompt.require().multiselect(descriptions.select, {
-          options: [
-            { label: 'Components', value: 'components' },
+        console.log('has no')
+        const answers = await prompts({
+          type: 'multiselect',
+          name: 'build',
+          message: descriptions.select,
+          choices: [
+            { title: 'Components', value: 'components' },
             // { label: 'Vue Components', value: 'vue-components' },
-            { label: 'Web Components', value: 'web-components' },
-            { label: 'Functions', value: 'functions' },
-            { label: 'Views', value: 'views' },
-            { label: 'Documentation', value: 'docs' },
+            { title: 'Web Components', value: 'web-components' },
+            { title: 'Functions', value: 'functions' },
+            { title: 'Views', value: 'views' },
+            { title: 'Documentation', value: 'docs' },
           ],
         })
 
-        if (answers !== null) process.exit(ExitCode.InvalidArgument)
-
-        if (isString(answers)) answers = [answers]
-
-        // creates an object out of array and sets answers to true
-        options = answers.reduce((a: any, v: any) => {
-          a[v] = true
-          return a
-        }, {})
+        console.log('answers', answers)
+        if (answers !== null)
+          process.exit(ExitCode.InvalidArgument)
+      }
+      else {
+        console.log('has op')
       }
 
-      await runAction(Action.BuildStacks, options)
-
+      if (options.docs)
+        await runAction(Action.BuildDocs)
+      if (options.components)
+        await runAction(Action.BuildComponentLibs)
+      if (options.vueComponents)
+        await runAction(Action.BuildVueComponentLib)
+      if (options.webComponents)
+        await runAction(Action.BuildWebComponentLib)
+      if (options.functions)
+        await runAction(Action.BuildFunctionLib)
+      if (options.views)
+        await runAction(Action.BuildViews)
+      if (options.stacks)
+        await runAction(Action.BuildStacks)
+      if (options.buddy)
+        await runAction(Action.BuildCli)
+      if (options.server)
+        await runAction(Action.BuildServer)
       process.exit(ExitCode.Success)
     })
 
@@ -268,14 +286,14 @@ export function build(buddy: CLI) {
 
 function hasNoOptions(options: BuildOptions) {
   return (
-    !options.components &&
-    !options.vueComponents &&
-    !options.webComponents &&
-    !options.elements &&
-    !options.functions &&
-    !options.views &&
-    !options.docs &&
-    !options.stacks &&
-    !options.buddy
+    !options.components
+    && !options.vueComponents
+    && !options.webComponents
+    && !options.elements
+    && !options.functions
+    && !options.views
+    && !options.docs
+    && !options.stacks
+    && !options.buddy
   )
 }

package/buddy/src/commands/changelog.ts

@@ -1,10 +1,10 @@
+import type { CLI, FreshOptions } from '@stacksjs/types'
 import process from 'node:process'
 import { runAction } from '@stacksjs/actions'
 import { intro, log, outro } from '@stacksjs/cli'
 import { Action } from '@stacksjs/enums'
-import type { CLI, FreshOptions } from '@stacksjs/types'
 
-export function changelog(buddy: CLI) {
+export function changelog(buddy: CLI): void {
   const descriptions = {
     changelog: 'Create a CHANGELOG.md file',
     quiet: 'Minimal output',

package/buddy/src/commands/clean.ts

@@ -1,11 +1,11 @@
+import type { CleanOptions, CLI } from '@stacksjs/types'
 import process from 'node:process'
 import { runAction } from '@stacksjs/actions'
 import { intro, log, outro } from '@stacksjs/cli'
 import { Action } from '@stacksjs/enums'
 import { ExitCode } from '@stacksjs/types'
-import type { CLI, CleanOptions } from '@stacksjs/types'
 
-export function clean(buddy: CLI) {
+export function clean(buddy: CLI): void {
   const descriptions = {
     clean: 'Removes all node_modules & lock files',
     project: 'Target a specific project',

package/buddy/src/commands/cloud.ts

@@ -1,3 +1,4 @@
+import type { CLI, CloudCliOptions } from '@stacksjs/types'
 import process from 'node:process'
 import { CloudFrontClient, CreateInvalidationCommand } from '@aws-sdk/client-cloudfront'
 import { intro, italic, log, outro, prompts, runCommand, underline } from '@stacksjs/cli'
@@ -10,15 +11,16 @@ import {
   deleteParameterStore,
   deleteStacksBuckets,
   deleteStacksFunctions,
+  deleteSubnets,
+  deleteVpcs,
   getCloudFrontDistributionId,
   getJumpBoxInstanceId,
 } from '@stacksjs/cloud'
 import { path as p } from '@stacksjs/path'
-import type { CLI, CloudCliOptions } from '@stacksjs/types'
 import { ExitCode } from '@stacksjs/types'
 import { loop } from '@stacksjs/utils'
 
-export function cloud(buddy: CLI) {
+export function cloud(buddy: CLI): void {
   const descriptions = {
     cloud: 'Interact with the Stacks Cloud',
     ssh: 'SSH into the Stacks Cloud',
@@ -101,8 +103,8 @@ export function cloud(buddy: CLI) {
         const command = new CreateInvalidationCommand(params)
 
         cloudfront.send(command).then(
-          (data) => console.log(data),
-          (err) => console.log(err, err.stack),
+          data => console.log(data),
+          err => console.log(err, err.stack),
         )
 
         await outro('Exited', { startTime, useSeconds: true })
@@ -110,7 +112,7 @@ export function cloud(buddy: CLI) {
       }
 
       if (options.diff) {
-        const result = await runCommand('npx cdk diff', {
+        const result = await runCommand('bunx --bun cdk diff', {
           cwd: p.frameworkCloudPath(),
           stdin: 'pipe',
         })
@@ -158,7 +160,7 @@ 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()
 
@@ -236,9 +238,9 @@ export function cloud(buddy: CLI) {
       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(`npx cdk destroy`, {
+      const result = await runCommand(`bunx --bun cdk destroy`, {
         ...options,
         cwd: p.frameworkCloudPath(),
         stdin: 'inherit',
@@ -280,7 +282,8 @@ export function cloud(buddy: CLI) {
           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)
       }
@@ -337,7 +340,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()
@@ -365,12 +368,13 @@ export function cloud(buddy: CLI) {
       const result3 = await deleteStacksFunctions()
 
       if (result3.isErr()) {
-        if (result3.error !== 'No stacks functions found')
+        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,
           )
+        }
 
         process.exit(ExitCode.FatalError)
       }
@@ -410,6 +414,21 @@ export function cloud(buddy: CLI) {
         process.exit(ExitCode.FatalError)
       }
 
+      // delete all vpcs & subnets & internet gateways
+      const result9 = await deleteVpcs()
+
+      if (result9.isErr()) {
+        await outro('While deleting the VPCs, there was an issue', { startTime, useSeconds: true }, result9.error)
+        process.exit(ExitCode.FatalError)
+      }
+
+      const result10 = await deleteSubnets()
+
+      if (result10.isErr()) {
+        await outro('While deleting the Subnets, there was an issue', { startTime, useSeconds: true }, result10.error)
+        process.exit(ExitCode.FatalError)
+      }
+
       log.info('Removing any CDK remnants...')
       const result6 = await deleteCdkRemnants()
 
@@ -508,7 +527,7 @@ export function cloud(buddy: CLI) {
 
       const startTime = await intro('buddy cloud:diff')
 
-      const result = await runCommand('npx cdk diff', {
+      const result = await runCommand('bunx --bun cdk diff', {
         cwd: p.frameworkCloudPath(),
         stdin: 'pipe',
       })

package/buddy/src/commands/commit.ts

@@ -1,9 +1,9 @@
+import type { CLI, FreshOptions } from '@stacksjs/types'
 import process from 'node:process'
 import { runCommit } from '@stacksjs/actions'
 import { log } from '@stacksjs/logging'
-import type { CLI, FreshOptions } from '@stacksjs/types'
 
-export function commit(buddy: CLI) {
+export function commit(buddy: CLI): void {
   const descriptions = {
     commit: 'Commit your stashed changes',
     project: 'Target a specific project',

package/buddy/src/commands/configure.ts

@@ -1,10 +1,10 @@
+import type { CLI, ConfigureOptions } from '@stacksjs/types'
 import process from 'node:process'
 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) {
+export function configure(buddy: CLI): void {
   const descriptions = {
     configure: 'Configure options',
     aws: 'Configure the AWS connection',
@@ -77,7 +77,8 @@ async function configureAws(options?: ConfigureOptions) {
     process.exit(ExitCode.FatalError)
   }
 
-  if (options?.quiet) return
+  if (options?.quiet)
+    return
 
   await outro('Exited', { startTime, useSeconds: true })
 }

package/buddy/src/commands/create.ts

@@ -1,3 +1,4 @@
+import type { CLI, CreateOptions } from '@stacksjs/types'
 import process from 'node:process'
 import { runAction } from '@stacksjs/actions'
 import { bold, cyan, dim, intro, log, runCommand } from '@stacksjs/cli'
@@ -5,10 +6,9 @@ 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 { useOnline } from '@stacksjs/utils'
 
-export function create(buddy: CLI) {
+export function create(buddy: CLI): void {
   const descriptions = {
     name: 'The name of the project',
     command: 'Create a new Stacks project',
@@ -101,7 +101,7 @@ function onlineCheck() {
 
 async function download(name: string, path: string, options: CreateOptions) {
   log.info('Setting up your stack.')
-  const result = await runCommand(`bunx giget stacks ${name}`, options)
+  const result = await runCommand(`bunx --bun giget stacks ${name}`, options)
   log.success(`Successfully scaffolded your project at ${cyan(path)}`)
 
   return result

package/buddy/src/commands/deploy.ts

@@ -1,21 +1,22 @@
+import type { CLI, DeployOptions } from '@stacksjs/types'
 import process from 'node:process'
 import { runAction } from '@stacksjs/actions'
-import { intro, italic, log, outro, runCommand } from '@stacksjs/cli'
+import { intro, italic, log, outro, prompts, runCommand } from '@stacksjs/cli'
 import { app } from '@stacksjs/config'
 import { addDomain, hasUserDomainBeenAddedToCloud } from '@stacksjs/dns'
 import { Action } from '@stacksjs/enums'
 import { path as p } from '@stacksjs/path'
 import { ExitCode } from '@stacksjs/types'
-import type { CLI, DeployOptions } from '@stacksjs/types'
 import { $ } from 'bun'
 
-export function deploy(buddy: CLI) {
+export function deploy(buddy: CLI): void {
   const descriptions = {
     deploy: 'Deploy your project',
     project: 'Target a specific project',
     production: 'Deploy to production',
     development: 'Deploy to development',
     staging: 'Deploy to staging',
+    yes: 'Confirm all prompts by default',
     domain: 'Specify a domain to deploy to',
     verbose: 'Enable verbose output',
   }
@@ -26,6 +27,7 @@ export function deploy(buddy: CLI) {
     .option('-p, --project [project]', descriptions.project, { default: false })
     .option('--prod', descriptions.production, { default: true })
     .option('--dev', descriptions.development, { default: false })
+    .option('--yes', descriptions.yes, { default: false })
     .option('--staging', descriptions.staging, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (env: string | undefined, options: DeployOptions) => {
@@ -34,7 +36,8 @@ export function deploy(buddy: CLI) {
       const startTime = await intro('buddy deploy')
       const domain = options.domain || app.url
 
-      if (options.prod || env === 'production' || env === 'prod') await confirmProductionDeployment()
+      if ((options.prod || env === 'production' || env === 'prod') && !options.yes)
+        await confirmProductionDeployment()
 
       if (!domain) {
         log.info('No domain found in your .env or ./config/app.ts')
@@ -71,15 +74,20 @@ export function deploy(buddy: CLI) {
 }
 
 async function confirmProductionDeployment() {
-  const answer = await log.prompt.require().confirm('Are you sure you want to deploy to production?')
+  const { confirmed } = await prompts({
+    type: 'confirm',
+    name: 'confirmed',
+    message: 'Are you sure you want to deploy to production?',
+  })
 
-  if (!answer) {
+  if (!confirmed) {
     log.info('Aborting deployment...')
     process.exit(ExitCode.InvalidArgument)
   }
 }
 
 async function configureDomain(domain: string, options: DeployOptions, startTime: number) {
+  log.debug('Configuring domain...', domain)
   if (!domain) {
     log.info('We could not identify a domain to deploy to.')
     log.warn('Please set your .env or ./config/app.ts properly.')
@@ -144,9 +152,10 @@ async function checkIfAwsIsConfigured() {
   })
 
   if (result.isErr()) {
-    log.error('AWS is not configured properly.')
+    log.error('AWS is not configured properly.', {
+      shouldExit: false,
+    })
     log.error('Please run `buddy configure:aws` to set up your AWS credentials.')
-    process.exit(ExitCode.FatalError)
   }
 
   log.success('AWS is configured')
@@ -161,7 +170,8 @@ async function checkIfAwsIsBootstrapped() {
     log.success('AWS is bootstrapped')
 
     return true
-  } catch (err: any) {
+  }
+  catch (err: any) {
     log.debug(`Not yet bootstrapped. Failed with code ${err.exitCode}`)
     log.debug(err.stdout.toString())
     log.debug(err.stderr.toString())
@@ -174,7 +184,8 @@ async function checkIfAwsIsBootstrapped() {
       const result = await $`bun run bootstrap`
       console.log(result)
       return true
-    } catch (error) {
+    }
+    catch (error) {
       log.error('Failed to bootstrap AWS')
       console.error(error)
       process.exit(ExitCode.FatalError)