@stacksjs/buddy 0.64.5 → 0.65.0

package/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)

package/src/commands/dev.ts

@@ -1,3 +1,4 @@
+import type { CLI, DevOptions } from '@stacksjs/types'
 import process from 'node:process'
 import {
   runAction,
@@ -9,13 +10,12 @@ import {
   runFrontendDevServer,
   runSystemTrayDevServer,
 } from '@stacksjs/actions'
-import { intro, log, outro, runCommand } from '@stacksjs/cli'
+import { intro, log, outro, prompts, runCommand } from '@stacksjs/cli'
 import { Action } from '@stacksjs/enums'
 import { libsPath } from '@stacksjs/path'
 import { ExitCode } from '@stacksjs/types'
-import type { CLI, DevOptions } from '@stacksjs/types'
 
-export function dev(buddy: CLI) {
+export function dev(buddy: CLI): void {
   const descriptions = {
     dev: 'Start development server',
     frontend: 'Start the frontend development server',
@@ -91,38 +91,50 @@ export function dev(buddy: CLI) {
       }
 
       if (wantsInteractive(options)) {
-        const answer = await log.prompt.require().select(descriptions.select, {
-          options: [
-            { value: 'all', label: 'All' },
-            { value: 'frontend', label: 'Frontend' },
-            { value: 'api', label: 'Backend' },
-            { value: 'dashboard', label: 'Dashboard' },
-            { value: 'desktop', label: 'Desktop' },
-            { value: 'email', label: 'Email' },
-            { value: 'components', label: 'Components' },
-            { value: 'docs', label: 'Documentation' },
+        const answer = await prompts({
+          type: 'select',
+          name: 'value',
+          message: descriptions.select,
+          choices: [
+            { value: 'all', title: 'All' },
+            { value: 'frontend', title: 'Frontend' },
+            { value: 'api', title: 'Backend' },
+            { value: 'dashboard', title: 'Dashboard' },
+            { value: 'desktop', title: 'Desktop' },
+            { value: 'email', title: 'Email' },
+            { value: 'components', title: 'Components' },
+            { value: 'docs', title: 'Documentation' },
           ],
         })
 
-        if (answer === 'components') {
+        const selectedValue: string = answer.value
+
+        if (selectedValue === 'components') {
           await runComponentsDevServer(options)
-        } else if (answer === 'api') {
+        }
+        else if (selectedValue === 'api') {
           await runApiDevServer(options)
-        } else if (answer === 'dashboard') {
+        }
+        else if (selectedValue === 'dashboard') {
           await runDashboardDevServer(options)
         }
-        // else if (answer === 'email')
+        // else if (selectedValue === 'email')
         //   await runEmailDevServer(options)
-        else if (answer === 'docs') {
+        else if (selectedValue === 'docs') {
           await runDocsDevServer(options)
-        } else {
+        }
+        else {
           log.error('Invalid option during interactive mode')
           process.exit(ExitCode.InvalidArgument)
         }
-      } else {
-        if (options.components) await runComponentsDevServer(options)
-        if (options.docs) await runDocsDevServer(options)
-        else if (options.api) await runApiDevServer(options)
+      }
+      else {
+        if (options.components)
+          await runComponentsDevServer(options)
+        if (options.docs)
+          await runDocsDevServer(options)
+        else if (options.api)
+          await runApiDevServer(options)
         // else if (options.email)
         //   await runEmailDevServer(options)
       }
@@ -146,7 +158,8 @@ export function dev(buddy: CLI) {
         // silent: !options.verbose,
       })
 
-      if (options.verbose) log.info('buddy dev:components result', result)
+      if (options.verbose)
+        log.info('buddy dev:components result', result)
 
       if (result.isErr()) {
         await outro(
@@ -265,7 +278,7 @@ export function dev(buddy: CLI) {
   })
 }
 
-export async function startDevelopmentServer(options: DevOptions) {
+export async function startDevelopmentServer(options: DevOptions): Promise<void> {
   const result = await runAction(Action.Dev, options)
 
   if (result.isErr()) {

package/src/commands/dns.ts

@@ -1,8 +1,8 @@
+import type { CLI } from '@stacksjs/types'
 import process from 'node:process'
 import { log, runCommand } from '@stacksjs/cli'
 import { config } from '@stacksjs/config'
 import { ExitCode } from '@stacksjs/types'
-import type { CLI } from '@stacksjs/types'
 
 // import { Action } from '@stacksjs/enums'
 // import { runAction } from '@stacksjs/actions'
@@ -23,7 +23,7 @@ interface DnsOptions {
   verbose?: boolean
 }
 
-export function dns(buddy: CLI) {
+export function dns(buddy: CLI): void {
   const descriptions = {
     dns: 'Lists the DNS records for a domain',
     query: 'Host name or IP address to query',

package/src/commands/domains.ts

@@ -1,3 +1,4 @@
+import type { CLI, DomainsOptions } from '@stacksjs/types'
 import process from 'node:process'
 import { runAction } from '@stacksjs/actions'
 import { bgCyan, bold, intro, italic, log, outro, prompts } from '@stacksjs/cli'
@@ -5,9 +6,8 @@ import { config } from '@stacksjs/config'
 import { addDomain } from '@stacksjs/dns'
 import { Action } from '@stacksjs/enums'
 import { ExitCode } from '@stacksjs/types'
-import type { CLI, DomainsOptions } from '@stacksjs/types'
 
-export function domains(buddy: CLI) {
+export function domains(buddy: CLI): void {
   const descriptions = {
     purchase: 'Purchase a domain',
     add: 'Add a domain to your cloud', // given you already own it with a different registrar

package/src/commands/fresh.ts

@@ -1,11 +1,11 @@
+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 { ExitCode } from '@stacksjs/types'
-import type { CLI, FreshOptions } from '@stacksjs/types'
 
-export function fresh(buddy: CLI) {
+export function fresh(buddy: CLI): void {
   const descriptions = {
     fresh: 'Re-installs your npm dependencies',
     project: 'Target a specific project',

package/src/commands/generate.ts

@@ -4,17 +4,18 @@ import {
   generateCoreSymlink,
   generateIdeHelpers,
   generateLibEntries,
+  generateOpenApiSpec,
   generatePkgxConfig,
   generateTypes,
   generateVsCodeCustomData,
   generateWebTypes,
-  // generateOpenApiSpec,
   invoke as startGenerationProcess,
 } from '@stacksjs/actions'
 import { intro, log, outro } from '@stacksjs/cli'
+import { generateModelFiles } from '@stacksjs/orm'
 import { type CLI, ExitCode, type GeneratorOptions } from '@stacksjs/types'
 
-export function generate(buddy: CLI) {
+export function generate(buddy: CLI): void {
   const descriptions = {
     command:
       'Automagically build any of your libraries/packages for production use. Select any of the following packages',
@@ -26,6 +27,7 @@ export function generate(buddy: CLI) {
     componentMeta: 'Generate component meta information',
     coreSymlink: 'Generate symlink of the core framework to the project root',
     pkgx: 'Generate the pkgx configuration file',
+    modelFiles: 'Generate the model files',
     openApi: 'Generate the OpenAPI specification',
     select: 'What are you trying to generate?',
     project: 'Target a specific project',
@@ -41,6 +43,7 @@ export function generate(buddy: CLI) {
     .option('-i, --ide-helpers', descriptions.ideHelpers)
     .option('-c, --component-meta', descriptions.componentMeta)
     .option('-p, --pkgx', descriptions.pkgx)
+    .option('-m, --model-files', descriptions.modelFiles)
     .option('-o, --openapi', descriptions.openApi)
     .option('-p, --project [project]', descriptions.project, { default: false })
     .option('--core-symlink', descriptions.coreSymlink)
@@ -138,6 +141,27 @@ export function generate(buddy: CLI) {
       generatePkgxConfig()
     })
 
+  buddy
+    .command('generate:model-files', descriptions.modelFiles)
+    .option('-p, --project [project]', descriptions.project, { default: false })
+    .option('--verbose', descriptions.verbose, { default: false })
+    .action(async () => {
+      const perf = await intro('buddy generate:model-files')
+
+      try {
+        await generateModelFiles()
+
+        outro('Generated Model files', {
+          startTime: perf,
+          useSeconds: true,
+        })
+      }
+      catch (error) {
+        log.error('There was an error generating your model files', error)
+        process.exit(ExitCode.FatalError)
+      }
+    })
+
   buddy
     .command('generate:openapi-spec', descriptions.openApi)
     .alias('generate:openapi')
@@ -147,7 +171,7 @@ export function generate(buddy: CLI) {
       log.debug('Running `buddy generate:openapi-spec` ...', options)
       const perf = await intro('buddy generate:openapi-spec')
 
-      // await generateOpenApiSpec()
+      await generateOpenApiSpec()
 
       outro('Generated OpenAPI specification', {
         startTime: perf,

package/src/commands/http.ts

@@ -1,7 +1,7 @@
+import type { CLI } from '@stacksjs/types'
 import process from 'node:process'
 import { config } from '@stacksjs/config'
 import { ExitCode } from '@stacksjs/types'
-import type { CLI } from '@stacksjs/types'
 
 // import { path } from '@stacksjs/path'
 import { log, runCommandSync } from '@stacksjs/cli'
@@ -27,7 +27,7 @@ interface HttpOptions {
   verbose?: boolean
 }
 
-export function http(buddy: CLI) {
+export function http(buddy: CLI): void {
   const descriptions = {
     http: 'Send an HTTP request to a domain',
     project: 'Target a specific project',

package/src/commands/index.ts

@@ -7,15 +7,15 @@ export * from './configure'
 export * from './create'
 export * from './deploy'
 export * from './dev'
-export * from './domains'
 export * from './dns'
+export * from './domains'
 export * from './fresh'
 export * from './generate'
 export * from './http'
-export * from './lint'
-export * from './list'
 export * from './install'
 export * from './key'
+export * from './lint'
+export * from './list'
 export * from './make'
 export * from './migrate'
 export * from './outdated'

package/src/commands/install.ts

@@ -1,9 +1,9 @@
+import type { CLI, InstallOptions } from '@stacksjs/types'
 import process from 'node:process'
 import { log, runCommand } from '@stacksjs/cli'
 import { path as p } from '@stacksjs/path'
-import type { CLI, InstallOptions } from '@stacksjs/types'
 
-export function install(buddy: CLI) {
+export function install(buddy: CLI): void {
   const descriptions = {
     install: 'Install your dependencies',
     project: 'Target a specific project',

package/src/commands/key.ts

@@ -1,10 +1,10 @@
+import type { CLI, KeyOptions } 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, KeyOptions } from '@stacksjs/types'
 
-export function key(buddy: CLI) {
+export function key(buddy: CLI): void {
   const descriptions = {
     command: 'Generate & set the application key.',
     project: 'Target a specific project',

package/src/commands/lint.ts

@@ -1,10 +1,10 @@
+import type { CLI, LintOptions } from '@stacksjs/types'
 import process from 'node:process'
 import { runAction } from '@stacksjs/actions'
-import { intro, log, outro } from '@stacksjs/cli'
+import { intro, log, outro, runCommand } from '@stacksjs/cli'
 import { Action } from '@stacksjs/enums'
-import type { CLI, LintOptions } from '@stacksjs/types'
 
-export function lint(buddy: CLI) {
+export function lint(buddy: CLI): void {
   const descriptions = {
     lint: 'Automagically lints your project codebase',
     lintFix: 'Automagically fixes all lint errors',
@@ -21,13 +21,10 @@ export function lint(buddy: CLI) {
       log.debug('Running `buddy lint` ...', options)
 
       const startTime = await intro('buddy lint')
-      // const result = await runAction(Action.Lint, options)
-      //
-      // // console.log('res', result)
-      // if (result.isErr()) {
-      //   await outro('While running `buddy lint`, there was an issue', { startTime, useSeconds: true }, result.error)
-      //   process.exit()
-      // }
+
+      if (options.fix)
+        await runAction(Action.LintFix, { ...options })
+      else await runCommand('bunx --bun eslint .')
 
       await outro('Linted your project', { startTime, useSeconds: true })
     })

package/src/commands/list.ts

@@ -1,10 +1,10 @@
+import type { CLI, CliOptions } from '@stacksjs/types'
 import process from 'node:process'
 import { log } from '@stacksjs/logging'
 import { projectPath } from '@stacksjs/path'
-import type { CLI, CliOptions } from '@stacksjs/types'
 import { $ } from 'bun'
 
-export function list(buddy: CLI) {
+export function list(buddy: CLI): void {
   const descriptions = {
     list: 'List all of the project-specific Buddy commands',
     project: 'Target a specific project',

package/src/commands/make.ts

@@ -1,3 +1,4 @@
+import type { CLI, MakeOptions } from '@stacksjs/types'
 import process from 'node:process'
 import {
   createModel,
@@ -15,10 +16,9 @@ import { intro, italic, outro, runCommand } from '@stacksjs/cli'
 import { localUrl } from '@stacksjs/config'
 import { log } from '@stacksjs/logging'
 import { path as p } from '@stacksjs/path'
-import type { CLI, MakeOptions } from '@stacksjs/types'
 import { ExitCode } from '@stacksjs/types'
 
-export function make(buddy: CLI) {
+export function make(buddy: CLI): void {
   const descriptions = {
     action: 'Create a new action',
     model: 'Create a new model',
@@ -99,7 +99,7 @@ export function make(buddy: CLI) {
     .option('-n, --name [name]', descriptions.name, { default: false })
     .option('-p, --project [project]', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
-    .action(async (name, options: MakeOptions) => {
+    .action(async (name: string, options: MakeOptions) => {
       log.debug('Running `buddy make:component` ...', options)
 
       name = name ?? options.name
@@ -118,7 +118,7 @@ export function make(buddy: CLI) {
     .option('-n, --name [name]', descriptions.name, { default: false })
     .option('-p, --project [project]', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
-    .action((name, options: MakeOptions) => {
+    .action((name: string, options: MakeOptions) => {
       log.debug('Running `buddy make:database` ...', options)
 
       name = name ?? options.name
@@ -140,7 +140,7 @@ export function make(buddy: CLI) {
     .option('-n, --name [name]', descriptions.name, { default: false })
     .option('-p, --project [project]', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
-    .action((name, options: MakeOptions) => {
+    .action((name: string, options: MakeOptions) => {
       log.debug('Running `buddy make:factory` ...', options)
 
       name = name ?? options.name
@@ -160,7 +160,7 @@ export function make(buddy: CLI) {
     .option('-n, --name [name]', descriptions.name, { default: false })
     .option('-p, --project [project]', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
-    .action(async (name, options: MakeOptions) => {
+    .action(async (name: string, options: MakeOptions) => {
       log.debug('Running `buddy make:view` ...', options)
 
       name = name ?? options.name
@@ -190,7 +190,7 @@ export function make(buddy: CLI) {
     .option('-n, --name [name]', descriptions.name, { default: false })
     .option('-p, --project [project]', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
-    .action(async (name, options: MakeOptions) => {
+    .action(async (name: string, options: MakeOptions) => {
       log.debug('Running `buddy make:lang` ...', options)
 
       name = name ?? options.name
@@ -212,7 +212,7 @@ export function make(buddy: CLI) {
     .option('-s, --sms', 'Is it a SMS notification?', { default: false })
     .option('-p, --project [project]', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
-    .action(async (name, options: MakeOptions) => {
+    .action(async (name: string, options: MakeOptions) => {
       log.debug('Running `buddy make:notification` ...', options)
 
       const perf = await intro('buddy make:notification')
@@ -247,7 +247,7 @@ export function make(buddy: CLI) {
     .option('-n, --name [name]', descriptions.name, { default: false })
     .option('-p, --project [project]', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
-    .action((name, options: MakeOptions) => {
+    .action((name: string, options: MakeOptions) => {
       log.debug('Running `buddy make:stack` ...', options)
 
       name = name ?? options.name
@@ -266,7 +266,7 @@ export function make(buddy: CLI) {
     .option('-n, --name [name]', descriptions.name, { default: false })
     .option('-p, --project [project]', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
-    .action(async (name, options: MakeOptions) => {
+    .action(async (name: string, options: MakeOptions) => {
       log.info('Running `buddy make:action` ...')
       log.debug('Running `buddy make:action` ...', name, options)
 
@@ -286,7 +286,7 @@ export function make(buddy: CLI) {
     .option('-n, --name [name]', descriptions.name, { default: false })
     .option('-p, --project [project]', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
-    .action(async (name, options: MakeOptions) => {
+    .action(async (name: string, options: MakeOptions) => {
       log.debug('Running `buddy make:model` ...', options)
 
       name = name ?? options.name
@@ -305,7 +305,7 @@ export function make(buddy: CLI) {
     .option('-n, --name [name]', descriptions.name, { default: false })
     .option('-p, --project [project]', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
-    .action((name, options: MakeOptions) => {
+    .action((name: string, options: MakeOptions) => {
       log.debug('Running `buddy make:migration` ...', options)
 
       name = name ?? options.name

package/src/commands/migrate.ts

@@ -1,11 +1,11 @@
+import type { CLI, MigrateOptions } 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, MigrateOptions } from '@stacksjs/types'
 
-export function migrate(buddy: CLI) {
+export function migrate(buddy: CLI): void {
   const descriptions = {
     migrate: 'Migrates your database',
     dns: 'Writes the DNS records for a domain to ./config/dns.ts',

package/src/commands/outdated.ts

@@ -1,10 +1,10 @@
+import type { CLI } from '@stacksjs/types'
 import process from 'node:process'
 import { log } from '@stacksjs/logging'
 import { projectPath } from '@stacksjs/path'
-import type { CLI, CliOptions } from '@stacksjs/types'
 import { $ } from 'bun'
 
-export function outdated(buddy: CLI) {
+export function outdated(buddy: CLI): void {
   const descriptions = {
     outdated: 'List all the outdated project dependencies',
     project: 'Target a specific project',
@@ -15,7 +15,7 @@ export function outdated(buddy: CLI) {
     .command('outdated', descriptions.outdated)
     .option('-p, --project [project]', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
-    .action(async (options: CliOptions) => {
+    .action(async () => {
       log.debug('Running `buddy outdated` ...')
 
       $.cwd(projectPath())