chore: wip

Author: chrisbbreuer

.github/stale.yml

@@ -9,6 +9,6 @@ exemptLabels:
 staleLabel: stale
 markComment: >
   This issue has been automatically marked as stale because it has not had
-  recent activity. It will be closed if no further activity occurs. Thank you
-  for your contributions.
+  recent activity. It will be closed if no further activity occurs.
+  Thank you for your contributions.
 closeComment: false

.stacks/core/actions/src/helpers/utils.ts

@@ -2,7 +2,7 @@ import storage from '@stacksjs/storage'
 import { italic, log, runCommand, runCommands } from '@stacksjs/cli'
 import { actionsPath, functionsPath } from '@stacksjs/path'
 import type { ActionOptions, CommandResult } from '@stacksjs/types'
-import type { Err, Result } from '@stacksjs/error-handling'
+import type { Result, errAsync } from '@stacksjs/error-handling'
 import { err } from '@stacksjs/error-handling'
 
 function parseOptions(options?: ActionOptions) {
@@ -22,11 +22,7 @@ function parseOptions(options?: ActionOptions) {
   return parsedOptions.filter(Boolean).join(' ').replace('----=', '')
 }
 
-export type ActionResult = Promise<
-  Result<CommandResult<string>, Error>
-  | Result<CommandResult<string>, Error>[]
-  | Err<CommandResult<string>, string>
->
+export type ActionResult = CommandResult
 
 /**
  * Run an Action the Stacks way.
@@ -35,17 +31,12 @@ export type ActionResult = Promise<
  * @param options The options to pass to the command.
  * @returns The result of the command.
  */
-export async function runAction(action: string, options?: ActionOptions): Promise<
-  Result<CommandResult<string>, Error>
-  | Result<CommandResult<string>, Error>[]
-  | Err<CommandResult<string>, string>
-> {
+export async function runAction(action: string, options?: ActionOptions): Promise<CommandResult | CommandResult[]> {
   if (!hasAction(action))
-    return err(`The specified action "${action}" does not exist.`)
+    return errAsync(`The specified action "${action}" does not exist.`)
 
   // we need to parse options here because they need to bw passed to the action
   const opts = parseOptions(options)
-
   const cmd = `npx esno ${actionsPath(`${action}.ts ${opts}`)}`
 
   if (options?.verbose)
@@ -63,7 +54,7 @@ export async function runAction(action: string, options?: ActionOptions): Promis
  * @param options The options to pass to the command.
  * @returns The result of the command.
  */
-export async function runActions(actions: string[], options?: ActionOptions): Promise<Result<CommandResult<string>, Error>[] | Result<CommandResult<string>, Error> | Err<CommandResult<string>, string>> {
+export async function runActions(actions: string[], options?: ActionOptions): Promise<CommandResult> | Promise<CommandResult>[] {
   if (!actions.length)
     return err('No actions were specified')
 

.stacks/core/actions/src/preinstall.ts

@@ -1,11 +1,11 @@
 import { log, spawn } from '@stacksjs/cli'
 import { projectPath } from '@stacksjs/path'
 import type { PreinstallOptions } from '@stacksjs/types'
-import { determineDebugMode } from '@stacksjs/utils'
+import { determineDebugLevel } from '@stacksjs/utils'
 
 export async function invoke(options?: PreinstallOptions) {
   try {
-    const stdio = determineDebugMode(options) ? 'inherit' : 'ignore'
+    const stdio = determineDebugLevel(options) ? 'inherit' : 'ignore'
 
     log.info('Preinstall check...')
     await spawn('npx only-allow pnpm', { stdio, cwd: projectPath() })

.stacks/core/actions/src/upgrade.ts

@@ -1,13 +1,13 @@
 import { intro, log, outro, prompt, runCommand, spawn } from '@stacksjs/cli'
 import storage from '@stacksjs/storage'
-import { determineDebugMode } from '@stacksjs/utils'
+import { determineDebugLevel } from '@stacksjs/utils'
 import { projectPath } from '@stacksjs/path'
 import type { UpgradeOptions } from '@stacksjs/types'
 import { ExitCode, NpmScript } from '@stacksjs/types'
 
 export async function checkForUncommittedChanges(path = './.stacks', options: UpgradeOptions) {
   try {
-    const stdio = determineDebugMode(options) ? 'inherit' : 'ignore'
+    const stdio = determineDebugLevel(options) ? 'inherit' : 'ignore'
 
     // check if the .stacks folder has any updates
     // https://carlosbecker.com/posts/git-changed/

.stacks/core/actions/src/upgrade/framework.ts

@@ -1,6 +1,6 @@
 import { log, outro } from '@stacksjs/cli'
 import storage from '@stacksjs/storage'
-import { determineDebugMode, loop } from '@stacksjs/utils'
+import { determineDebugLevel, loop } from '@stacksjs/utils'
 import { frameworkPath, projectPath } from '@stacksjs/path'
 
 // await runCommand(NpmScript.UpgradeFramework, parseArgs())
@@ -20,7 +20,7 @@ loop(5, async () => {
 
 await storage.copyFolder(frameworkPath(), projectPath('./updates/.stacks'), exclude)
 
-if (determineDebugMode(options))
+if (determineDebugLevel(options))
   log.info('Cleanup...')
 
 await storage.deleteFolder(projectPath('updates'))

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

@@ -14,7 +14,7 @@ async function fresh(buddy: CLI) {
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: FreshOptions) => {
       const perf = await intro('buddy fresh')
-      const result = await runAction(Action.Fresh, { ...options, showSpinner: true, spinnerText: 'Freshly installing dependencies...' })
+      const result = await runAction(Action.Fresh, options)
 
       if (result.isErr()) {
         outro('While running the fresh command, there was an issue', { startTime: perf, useSeconds: true, isError: true }, result.error)

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

@@ -14,7 +14,7 @@ async function migrate(buddy: CLI) {
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: FreshOptions) => {
       const perf = await intro('buddy migrate')
-      const result = await runAction(Action.Migrate, { ...options, showSpinner: true, spinnerText: 'Freshly installing dependencies...' })
+      const result = await runAction(Action.Migrate, { ...options, showSpinner: true, spinnerText: 'Migrating...' })
 
       if (result.isErr()) {
         outro('While running the migrate command, there was an issue', { startTime: perf, useSeconds: true, isError: true }, result.error)

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

@@ -12,7 +12,7 @@ async function seed(buddy: CLI) {
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: FreshOptions) => {
       // const perf = await intro('buddy seed')
-      // const result = await runAction(Action.Seed, { ...options, showSpinner: true, spinnerText: 'Freshly installing dependencies...' })
+      // const result = await runAction(Action.Seed, { ...options, showSpinner: true, spinnerText: 'Seeding...' })
 
       // if (result.isErr()) {
       //   outro('While running the seed command, there was an issue', { startTime: perf, useSeconds: true, isError: true }, result.error)

.stacks/core/cli/src/run.ts

@@ -1,10 +1,8 @@
 import { execSync as childExec } from 'node:child_process'
-import type { Err } from '@stacksjs/error-handling'
-import type { CliOptions, CommandResult, Result, SpinnerOptions as Spinner } from '@stacksjs/types'
+import type { CliOptions, CommandResult, SpinnerOptions as Spinner } from '@stacksjs/types'
 import { projectPath } from '@stacksjs/path'
 import { ResultAsync, err } from '@stacksjs/error-handling'
-import { log } from '@stacksjs/logging'
-import { determineDebugMode } from '@stacksjs/utils'
+import { determineDebugLevel } from '@stacksjs/utils'
 import { spawn } from './command'
 import { startSpinner } from './helpers'
 import { italic } from '.'
@@ -17,14 +15,15 @@ import { italic } from '.'
  * @param errorMsg The name of the error to throw if the command fails.
  * @returns The result of the command.
  */
-export function exec(command: string, options?: CliOptions) {
+export function exec(command: string, options?: CliOptions): CommandResult {
   const cwd = options?.cwd || projectPath()
-  const stdio = determineDebugMode(options) ? 'inherit' : 'ignore'
+  const stdio = determineDebugLevel(options) ? 'inherit' : 'ignore'
   const shell = options?.shell || false
 
   return ResultAsync.fromPromise(
     spawn(command, { stdio, cwd, shell }),
-    () => log.error(new Error(`Failed to run command: ${italic(command)}`)),
+    // () => new Error(`Failed to run command: ${italic(command)}`),
+    () => new Error(`Failed to run command: ${italic(command)}`),
   )
 }
 
@@ -45,7 +44,7 @@ export function execSync(command: string) {
  * @param options The options to pass to the command.
  * @returns The result of the command.
  */
-export async function runCommand(command: string, options?: CliOptions) {
+export async function runCommand(command: string, options?: CliOptions): Promise<CommandResult> {
   return await exec(command, options)
 }
 
@@ -56,12 +55,14 @@ export async function runCommand(command: string, options?: CliOptions) {
  * @param options The options to pass to the command.
  * @returns The result of the command.
  */
-export async function runCommands(commands: string[], options?: CliOptions): Promise<Result<CommandResult<string>, Error>[] | Result<CommandResult<string>, Error> | Err<CommandResult<string>, string>> {
-  const results: Result<CommandResult<string>, Error>[] = []
+export async function runCommands(commands: string[], options?: CliOptions): Promise<CommandResult[]> {
+  const results: CommandResult[] = []
   const numberOfCommands = commands.length
 
-  if (!numberOfCommands)
-    return err('No commands were specified')
+  if (!numberOfCommands) {
+    log.error(new Error('No commands were specified'))
+    process.exit()
+  }
 
   const spinner = determineSpinner(options)
 
@@ -93,7 +94,7 @@ export async function runCommands(commands: string[], options?: CliOptions): Pro
 }
 
 function determineSpinner(options?: CliOptions): Spinner | undefined {
-  if (!determineDebugMode(options))
+  if (!determineDebugLevel(options))
     return startSpinner(options?.spinnerText)
 
   return undefined

.stacks/core/config/src/index.ts

@@ -10,23 +10,23 @@ export function env(key: string, fallback: any) {
 
 export { defineBuildConfig } from 'unbuild'
 
-export function defineAppConfig(options: AppOptions) {
+export function defineApp(options: AppOptions) {
   return options
 }
 
-export function defineCacheConfig(options: CacheOptions) {
+export function defineCache(options: CacheOptions) {
   return options
 }
 
-export function defineCliConfig(options: CliOptions) {
+export function defineCli(options: CliOptions) {
   return options
 }
 
 export function defineCronJobsConfig(options: CronJobOptions[]) {
   return options
 }
 
-export function defineDatabaseConfig(options: DatabaseOptions) {
+export function defineDatabase(options: DatabaseOptions) {
   return options
 }
 
@@ -38,58 +38,58 @@ export function defineDebugConfig(options: DebugOptions) {
 //   return options
 // }
 
-export function defineDnsConfig(options: DnsOptions) {
+export function defineDns(options: DnsOptions) {
   return options
 }
 
 export function defineEmailConfig(options: EmailOptions) {
   return options
 }
 
-export function defineEventsConfig(options: Events) {
+export function defineEvents(options: Events) {
   return options
 }
 
-export function defineGitConfig(options: GitOptions) {
+export function defineGit(options: GitOptions) {
   return options
 }
 
-export function defineHashingConfig(options: HashingOptions) {
+export function defineHashing(options: HashingOptions) {
   return options
 }
 
-export function defineLibraryConfig(options: LibraryOptions) {
+export function defineLibrary(options: LibraryOptions) {
   return options
 }
 
 export function defineModel(options: Model) {
   return options
 }
 
-export function defineNotificationConfig(options: NotificationOptions) {
+export function defineNotification(options: NotificationOptions) {
   return options
 }
 
-export function definePageConfig(options: PagesOption) {
+export function definePage(options: PagesOption) {
   return options
 }
 
-export function definePaymentConfig(options: PaymentOptions) {
+export function definePayment(options: PaymentOptions) {
   return options
 }
 
-export function defineSearchEngineConfig(options: SearchEngineOptions) {
+export function defineSearchEngine(options: SearchEngineOptions) {
   return options
 }
 
-export function defineServicesConfig(options: ServicesOptions) {
+export function defineServices(options: ServicesOptions) {
   return options
 }
 
-export function defineStorageConfig(options: StorageOptions) {
+export function defineStorage(options: StorageOptions) {
   return options
 }
 
-export function defineUiConfig(options: UiOptions) {
+export function defineUi(options: UiOptions) {
   return options
 }