@stacksjs/buddy 0.58.57 → 0.58.59

package/src/commands/dev.ts

@@ -12,7 +12,7 @@ import {
 } from '@stacksjs/actions'
 import { ExitCode } from '@stacksjs/types'
 import type { CLI, DevOptions } from '@stacksjs/types'
-import { intro, log, outro, prompt, runCommand } from '@stacksjs/cli'
+import { intro, log, outro, runCommand } from '@stacksjs/cli'
 import { libsPath } from '@stacksjs/path'
 
 export function dev(buddy: CLI) {
@@ -48,6 +48,8 @@ export function dev(buddy: CLI) {
     .option('-p, --project', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (server: string | undefined, options: DevOptions) => {
+      log.debug('Running `buddy dev [server]` ...', options)
+
       const perf = await intro('buddy dev')
 
       // log.info('Ensuring web server/s running...') // in other words, ensure caddy is running
@@ -89,39 +91,40 @@ export function dev(buddy: CLI) {
       }
 
       if (wantsInteractive(options)) {
-        const answer = await 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' },
-            ],
-          })
-
-        if (answer === 'components') {
-          await runComponentsDevServer(options)
-        }
-        else if (answer === 'api') {
-          await runApiDevServer(options)
-        }
-        else if (answer === 'dashboard') {
-          await runDashboardDevServer(options)
-        }
-        // else if (answer === 'email')
-        //   await runEmailDevServer(options)
-        else if (answer === 'docs') {
-          await runDocsDevServer(options)
-        }
-
-        else {
-          log.error('Invalid option during interactive mode')
-          process.exit(ExitCode.InvalidArgument)
-        }
+        // TODO: uncomment this when prompt is available
+        // const answer = await 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' },
+        //     ],
+        //   })
+        //
+        // if (answer === 'components') {
+        //   await runComponentsDevServer(options)
+        // }
+        // else if (answer === 'api') {
+        //   await runApiDevServer(options)
+        // }
+        // else if (answer === 'dashboard') {
+        //   await runDashboardDevServer(options)
+        // }
+        // // else if (answer === 'email')
+        // //   await runEmailDevServer(options)
+        // else if (answer === 'docs') {
+        //   await runDocsDevServer(options)
+        // }
+        //
+        // else {
+        //   log.error('Invalid option during interactive mode')
+        //   process.exit(ExitCode.InvalidArgument)
+        // }
       }
 
       else {
@@ -146,6 +149,8 @@ export function dev(buddy: CLI) {
     .option('-p, --project', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: DevOptions) => {
+      log.debug('Running `buddy dev:components` ...', options)
+
       const perf = await intro('buddy dev:components')
       const result = await runCommand('bun run dev', {
         cwd: libsPath('components/vue'),
@@ -171,6 +176,8 @@ export function dev(buddy: CLI) {
     .option('-p, --project', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: DevOptions) => {
+      log.debug('Running `buddy dev:docs` ...', options)
+
       const perf = await intro('buddy dev:docs')
       const result = await runAction(Action.DevDocs, options)
 
@@ -190,6 +197,8 @@ export function dev(buddy: CLI) {
     .option('-p, --project', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: DevOptions) => {
+      log.debug('Running `buddy dev:desktop` ...', options)
+
       const perf = await intro('buddy dev:desktop')
       const result = await runAction(Action.DevDesktop, options)
 
@@ -209,13 +218,15 @@ export function dev(buddy: CLI) {
     .option('-p, --project', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: DevOptions) => {
+      log.debug('Running `buddy dev:api` ...', options)
+
       await runApiDevServer(options)
     })
 
   // buddy
   //   .command('dev:functions', descriptions.api)
-    .option('-p, --project', descriptions.project, { default: false })//
-    .option('--verbose', descriptions.verbose, { default: false })
+  //   .option('-p, --project', descriptions.project, { default: false })//
+  //   .option('--verbose', descriptions.verbose, { default: false })
   //   .action(async (options: DevOptions) => {
   //     await runFunctionsDevServer(options)
   //   })
@@ -227,6 +238,7 @@ export function dev(buddy: CLI) {
     .option('-p, --project', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: DevOptions) => {
+      log.debug('Running `buddy dev:frontend` ...', options)
       await runFrontendDevServer(options)
     })
 
@@ -236,6 +248,7 @@ export function dev(buddy: CLI) {
     .option('-p, --project', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: DevOptions) => {
+      log.debug('Running `buddy dev:dashboard` ...', options)
       await runDashboardDevServer(options)
     })
 
@@ -245,6 +258,7 @@ export function dev(buddy: CLI) {
     .option('-p, --project', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: DevOptions) => {
+      log.debug('Running `buddy dev:system-tray` ...', options)
       await runSystemTrayDevServer(options)
     })
 

package/src/commands/dns.ts

@@ -2,7 +2,7 @@ import process from 'node:process'
 import { ExitCode } from '@stacksjs/types'
 import type { CLI } from '@stacksjs/types'
 import { config } from '@stacksjs/config'
-import { runCommand } from '@stacksjs/cli'
+import { log, runCommand } from '@stacksjs/cli'
 
 // import { Action } from '@stacksjs/enums'
 // import { runAction } from '@stacksjs/actions'
@@ -59,6 +59,7 @@ export function dns(buddy: CLI) {
     .option('-p, --project', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (domain: string | undefined, options: DnsOptions) => {
+      log.debug('Running `buddy dns [domain]` ...', options)
       // let prettyOutput = false
 
       // if (options.json && options.pretty)
@@ -77,4 +78,9 @@ export function dns(buddy: CLI) {
 
       process.exit(ExitCode.Success)
     })
+
+  buddy.on('dns:*', () => {
+    console.error('Invalid command: %s\nSee --help for a list of available commands.', buddy.args.join(' '))
+    process.exit(1)
+  })
 }

package/src/commands/domains.ts

@@ -1,6 +1,6 @@
 import process from 'node:process'
 import { runAction } from '@stacksjs/actions'
-import { bgCyan, bold, intro, italic, outro, prompts } from '@stacksjs/cli'
+import { bgCyan, bold, intro, italic, log, outro, prompts } from '@stacksjs/cli'
 import { config } from '@stacksjs/config'
 import { addDomain } from '@stacksjs/dns'
 import { ExitCode } from '@stacksjs/types'
@@ -64,6 +64,8 @@ export function domains(buddy: CLI) {
     .option('-p, --project', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (domain: string, options: DomainsOptions) => {
+      log.debug('Running `buddy domains:purchase <domain>` ...', options)
+
       options.domain = domain
       const startTime = await intro('buddy domains:purchase')
       const result = await runAction(Action.DomainsPurchase, options)
@@ -103,6 +105,8 @@ export function domains(buddy: CLI) {
     .command('domains:add <domain>', descriptions.add)
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: DomainsOptions) => {
+      log.debug('Running `buddy domains:add <domain>` ...', options)
+
       const startTime = await intro('buddy domains:add')
       const result = await addDomain({
         ...options,
@@ -123,6 +127,8 @@ export function domains(buddy: CLI) {
     .option('--yes', descriptions.skip, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: DomainsOptions) => {
+      log.debug('Running `buddy domains:remove <domain>` ...', options)
+
       const domain = options.domain || config.app.url
       const opts = { ...options, domain }
       const startTime = await intro('buddy domains:remove')

package/src/commands/fresh.ts

@@ -2,12 +2,12 @@ import process from 'node:process'
 import { ExitCode } from '@stacksjs/types'
 import type { CLI, FreshOptions } from '@stacksjs/types'
 import { runAction } from '@stacksjs/actions'
-import { intro, outro } from '@stacksjs/cli'
+import { intro, log, outro } from '@stacksjs/cli'
 import { Action } from '@stacksjs/enums'
 
 export function fresh(buddy: CLI) {
   const descriptions = {
-    fresh: 'Reinstalls your npm dependencies',
+    fresh: 'Re-installs your npm dependencies',
     project: 'Target a specific project',
     verbose: 'Enable verbose output',
   }
@@ -17,6 +17,8 @@ export function fresh(buddy: CLI) {
     .option('-p, --project', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: FreshOptions) => {
+      log.debug('Running `buddy fresh` ...', options)
+
       const perf = await intro('buddy fresh')
       const result = await runAction(Action.Fresh, { ...options, stdout: 'inherit' })
 

package/src/commands/generate.ts

@@ -10,9 +10,8 @@ import {
   generateWebTypes,
   invoke as startGenerationProcess,
 } from '@stacksjs/actions'
-import { prompt } from '@stacksjs/cli'
+import { log } from '@stacksjs/cli'
 import { type CLI, ExitCode, type GeneratorOptions } from '@stacksjs/types'
-import { isString } from '@stacksjs/validation'
 
 export function generate(buddy: CLI) {
   const descriptions = {
@@ -41,25 +40,28 @@ export function generate(buddy: CLI) {
     .option('-p, --project', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: GeneratorOptions) => {
-      if (hasNoOptions(options)) {
-        let answers = await prompt.require()
-          .multiselect(descriptions.select, {
-            options: [
-              { label: '1.) TypeScript Types', value: 'types' },
-              { label: '2.) Library Entry Points', value: 'entries' },
-              { label: '3.) Web Types', value: 'web-types' },
-              { label: '4.) VS Code Custom Data', value: 'custom-data' },
-              { label: '5.) IDE Helpers', value: 'ide-helpers' },
-              { label: '6.) Component Meta', value: 'component-meta' },
-            ],
-          })
-
-        if (isString(answers))
-          answers = [answers]
-
-        // creates an object out of array and sets answers to true
-        options = (answers as Array<any>).reduce((a: any, v: any) => ({ ...a, [v]: true }), {})
-      }
+      log.debug('Running `buddy generate` ...', options)
+
+      // TODO: uncomment this
+      // if (hasNoOptions(options)) {
+      //   let answers = await prompt.require()
+      //     .multiselect(descriptions.select, {
+      //       options: [
+      //         { label: '1.) TypeScript Types', value: 'types' },
+      //         { label: '2.) Library Entry Points', value: 'entries' },
+      //         { label: '3.) Web Types', value: 'web-types' },
+      //         { label: '4.) VS Code Custom Data', value: 'custom-data' },
+      //         { label: '5.) IDE Helpers', value: 'ide-helpers' },
+      //         { label: '6.) Component Meta', value: 'component-meta' },
+      //       ],
+      //     })
+      //
+      //   if (isString(answers))
+      //     answers = [answers]
+      //
+      //   // creates an object out of array and sets answers to true
+      //   options = (answers as Array<any>).reduce((a: any, v: any) => ({ ...a, [v]: true }), {})
+      // }
 
       await startGenerationProcess(options)
 
@@ -72,6 +74,7 @@ export function generate(buddy: CLI) {
     .option('--verbose', descriptions.verbose, { default: false })
     .alias('types:generate')
     .action(async (options: GeneratorOptions) => {
+      log.debug('Running `buddy generate:types` ...', options)
       await generateTypes(options)
     })
 
@@ -80,6 +83,7 @@ export function generate(buddy: CLI) {
     .option('-p, --project', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: GeneratorOptions) => {
+      log.debug('Running `buddy generate:entries` ...', options)
       await generateLibEntries(options)
     })
 
@@ -88,6 +92,7 @@ export function generate(buddy: CLI) {
     .option('-p, --project', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: GeneratorOptions) => {
+      log.debug('Running `buddy generate:web-types` ...', options)
       await generateWebTypes(options)
     })
 
@@ -96,6 +101,7 @@ export function generate(buddy: CLI) {
     .option('-p, --project', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: GeneratorOptions) => {
+      log.debug('Running `buddy generate:vscode-custom-data` ...', options)
       await generateVsCodeCustomData(options)
     })
 
@@ -104,6 +110,7 @@ export function generate(buddy: CLI) {
     .option('-p, --project', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: GeneratorOptions) => {
+      log.debug('Running `buddy generate:ide-helpers` ...', options)
       await generateIdeHelpers(options)
     })
 
@@ -112,6 +119,7 @@ export function generate(buddy: CLI) {
     .option('-p, --project', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: GeneratorOptions) => {
+      log.debug('Running `buddy generate:component-meta` ...', options)
       await generateComponentMeta(options)
     })
 
@@ -119,13 +127,15 @@ export function generate(buddy: CLI) {
     .command('generate:pkgx-config', descriptions.pkgx)
     .option('-p, --project', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
-    .action(() => {
+    .action((options: GeneratorOptions) => {
+      log.debug('Running `buddy generate:pkgx-config` ...', options)
       generatePkgxConfig()
     })
 
   buddy
     .command('generate:migrations', 'Generate Migrations')
-    .action(() => {
+    .action((options: GeneratorOptions) => {
+      log.debug('Running `buddy generate:migrations` ...', options)
       generateMigrations()
     })
 
@@ -135,6 +145,6 @@ export function generate(buddy: CLI) {
   })
 }
 
-function hasNoOptions(options: GeneratorOptions) {
-  return !options.types && !options.entries && !options.webTypes && !options.customData && !options.ideHelpers && !options.componentMeta
-}
+// function hasNoOptions(options: GeneratorOptions) {
+//   return !options.types && !options.entries && !options.webTypes && !options.customData && !options.ideHelpers && !options.componentMeta
+// }

package/src/commands/http.ts

@@ -4,7 +4,7 @@ import type { CLI } from '@stacksjs/types'
 import { config } from '@stacksjs/config'
 
 // import { path } from '@stacksjs/path'
-import { runCommandSync } from '@stacksjs/cli'
+import { log, runCommandSync } from '@stacksjs/cli'
 
 // function runCommand(command: string): Promise<string> {
 //   return new Promise((resolve, reject) => {
@@ -39,6 +39,8 @@ export function http(buddy: CLI) {
     .option('-p, --project', descriptions.project, { default: false })
     // .option('--verbose', descriptions.verbose, { default: false })
     .action(async (domain: string | undefined, options: HttpOptions) => {
+      log.debug('Running `buddy http [domain]` ...', options)
+
       // Convert options object to command-line options string
       const optionsString = Object.entries(options)
         .filter(([key, value]) => key !== '--' && key.length > 1 && value !== false) // filter out '--' key and short options
@@ -46,9 +48,9 @@ export function http(buddy: CLI) {
         .join(' ')
 
       const command = `http GET ${domain || config.app.url} ${optionsString}`
-      // eslint-disable-next-line no-console
-      console.log(`Running command: ${command}`)
-      runCommandSync(command)
+
+      log.info(`Running command: ${command}`)
+      await runCommandSync(command)
 
       process.exit(ExitCode.Success)
     })

package/src/commands/index.ts

@@ -9,13 +9,11 @@ export * from './deploy'
 export * from './dev'
 export * from './domains'
 export * from './dns'
-export * from './example'
 export * from './fresh'
 export * from './generate'
 export * from './http'
 export * from './lint'
 export * from './list'
-export * from './inspire'
 export * from './install'
 export * from './key'
 export * from './make'

package/src/commands/install.ts

@@ -1,6 +1,6 @@
 import process from 'node:process'
 import type { CLI, InstallOptions } from '@stacksjs/types'
-import { runCommand } from '@stacksjs/cli'
+import { log, runCommand } from '@stacksjs/cli'
 import { path as p } from '@stacksjs/path'
 
 export function install(buddy: CLI) {
@@ -15,6 +15,8 @@ export function install(buddy: CLI) {
     .option('-p, --project', descriptions.project, { default: false })
     .option('-v, --verbose', descriptions.verbose, { default: false })
     .action(async (options: InstallOptions) => {
+      log.debug('Running `buddy install` ...', options)
+
       await runCommand('bun install', {
         ...options,
         cwd: p.projectPath(),

package/src/commands/key.ts

@@ -16,6 +16,8 @@ export function key(buddy: CLI) {
     .option('-p, --project', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: KeyOptions) => {
+      log.debug('Running `buddy key:generate` ...', options)
+
       await intro('buddy key:generate')
       const result = await runAction(Action.KeyGenerate, options)
 

package/src/commands/lint.ts

@@ -18,6 +18,8 @@ export function lint(buddy: CLI) {
     .option('-p, --project', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: LintOptions) => {
+      log.debug('Running `buddy lint` ...', options)
+
       const startTime = await intro('buddy lint')
       const result = await runAction(Action.Lint, options)
 
@@ -35,6 +37,8 @@ export function lint(buddy: CLI) {
     .option('-p, --project', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: LintOptions) => {
+      log.debug('Running `buddy lint:fix` ...', options)
+
       log.info('Fixing lint errors...')
       const result = await runAction(Action.LintFix, { ...options })
 

package/src/commands/list.ts

@@ -1,7 +1,8 @@
 import process from 'node:process'
-import type { CLI } from '@stacksjs/types'
+import type { CLI, CliOptions } from '@stacksjs/types'
 import { $ } from 'bun'
 import { projectPath } from '@stacksjs/path'
+import { log } from 'stacks/logging'
 
 export function list(buddy: CLI) {
   const descriptions = {
@@ -14,8 +15,11 @@ export function list(buddy: CLI) {
     .command('list', descriptions.list)
     .option('-p, --project', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
-    .action(async () => {
+    .action(async (options: CliOptions) => {
+      log.debug('Running `buddy list` ...', options)
+
       $.cwd(projectPath())
+
       const test = await $`buddy --help`.text()
       const commandsSection = test.match(/Commands:.*?(?=For more info, run any command with the)/s)?.[0]