chore: wip

Author: chrisbbreuer

storage/framework/core/actions/src/test.ts

@@ -1,8 +1,15 @@
-import { runCommand } from '@stacksjs/cli'
-import { NpmScript } from '@stacksjs/enums'
-import { frameworkPath } from '@stacksjs/path'
+import { log } from '@stacksjs/cli'
+import { projectPath } from '@stacksjs/path'
 
-await runCommand(NpmScript.TestFeature, {
-  verbose: true,
-  cwd: frameworkPath(),
+const process = Bun.spawn(['sh', '-c', 'bun test ./tests/feature/**'], {
+  cwd: projectPath(),
+  stdio: ['inherit', 'inherit', 'inherit'], // Inherit stdio to see the output in the console
+  // env: process.env, // Pass the environment variables
 })
+
+const exitCode = await process.exited
+
+if (exitCode !== 0) {
+  log.error('Tests failed')
+  process.exit(exitCode)
+}

storage/framework/core/actions/src/test/feature.ts

@@ -0,0 +1,15 @@
+import { log } from '@stacksjs/cli'
+import { projectPath } from '@stacksjs/path'
+
+const process = Bun.spawn(['sh', '-c', 'bun test ./tests/feature/** ./tests/unit/**'], {
+  cwd: projectPath(),
+  stdio: ['inherit', 'inherit', 'inherit'], // Inherit stdio to see the output in the console
+  // env: process.env, // Pass the environment variables
+})
+
+const exitCode = await process.exited
+
+if (exitCode !== 0) {
+  log.error('Tests failed')
+  process.exit(exitCode)
+}

storage/framework/core/actions/src/test/index.ts

@@ -1,5 +1,15 @@
-import { runCommand } from '@stacksjs/cli'
-import { NpmScript } from '@stacksjs/enums'
-import { frameworkPath } from '@stacksjs/path'
+import { log } from '@stacksjs/cli'
+import { projectPath } from '@stacksjs/path'
 
-await runCommand(NpmScript.TestUnit, { verbose: true, cwd: frameworkPath() })
+const process = Bun.spawn(['sh', '-c', 'bun test ./tests/unit/**'], {
+  cwd: projectPath(),
+  stdio: ['inherit', 'inherit', 'inherit'], // Inherit stdio to see the output in the console
+  // env: process.env, // Pass the environment variables
+})
+
+const exitCode = await process.exited
+
+if (exitCode !== 0) {
+  log.error('Tests failed')
+  process.exit(exitCode)
+}

storage/framework/core/actions/src/test/unit.ts

@@ -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)
 })

storage/framework/core/buddy/src/cli.ts

@@ -1,6 +1,6 @@
 import process from 'node:process'
 import { runAction } from '@stacksjs/actions'
-import { intro, outro } from '@stacksjs/cli'
+import { intro, log, outro } from '@stacksjs/cli'
 import { Action } from '@stacksjs/enums'
 import { projectPath } from '@stacksjs/path'
 import type { CLI, TestOptions } from '@stacksjs/types'
@@ -22,23 +22,78 @@ export function test(buddy: CLI) {
     .command('test', descriptions.command)
     .option('-f, --feature', descriptions.feature, { default: false })
     .option('-u, --unit', descriptions.unit, { default: false })
-    .option('--ui', descriptions.ui, { default: false })
+    // .option('--ui', descriptions.ui, { default: false })
     .option('-p, --project [project]', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: true })
     .action(async (options: TestOptions) => {
       const perf = await intro('buddy test')
-      const result = await runAction(Action.Test, {
-        ...options,
-        cwd: projectPath(),
-      })
 
-      if (result.isErr()) {
-        await outro(
-          'While running `buddy test`, there was an issue',
-          { startTime: perf, useSeconds: true },
-          result.error,
-        )
-        process.exit()
+      if (options.feature && options.unit) {
+        const result = await runAction(Action.Test, {
+          ...options,
+          cwd: projectPath(),
+        })
+
+        if (result.isErr()) {
+          await outro(
+            'While running `buddy test`, there was an issue',
+            { startTime: perf, useSeconds: true },
+            result.error,
+          )
+          process.exit()
+        }
+      }
+
+      if (options.feature && !options.unit) {
+        log.info('Running Feature tests...')
+
+        const result = await runAction(Action.TestFeature, {
+          ...options,
+          cwd: projectPath(),
+        })
+
+        if (result.isErr()) {
+          await outro(
+            'While running `buddy test`, there was an issue',
+            { startTime: perf, useSeconds: true },
+            result.error,
+          )
+          process.exit()
+        }
+      }
+
+      if (!options.feature && options.unit) {
+        log.info('Running Unit tests...')
+
+        const result = await runAction(Action.TestUnit, {
+          ...options,
+          cwd: projectPath(),
+        })
+
+        if (result.isErr()) {
+          await outro(
+            'While running `buddy test`, there was an issue',
+            { startTime: perf, useSeconds: true },
+            result.error,
+          )
+          process.exit()
+        }
+      }
+
+      if (!options.feature && !options.unit) {
+        const result = await runAction(Action.Test, {
+          ...options,
+          cwd: projectPath(),
+        })
+
+        if (result.isErr()) {
+          await outro(
+            'While running `buddy test`, there was an issue',
+            { startTime: perf, useSeconds: true },
+            result.error,
+          )
+          process.exit()
+        }
       }
 
       await outro('Finished running tests', {

storage/framework/core/buddy/src/commands/test.ts

@@ -85,10 +85,10 @@ export enum Action {
   Prepublish = 'prepublish',
   Release = 'release', // ✅
   RouteList = 'route/list', // ✅
-  Test = 'test',
-  TestUi = 'test-ui',
-  TestUnit = 'test-unit',
-  TestFeature = 'test-feature',
+  Test = 'test/index',
+  TestUi = 'test/ui',
+  TestUnit = 'test/unit',
+  TestFeature = 'test/feature',
   Typecheck = 'typecheck',
   Upgrade = 'upgrade/index',
   UpgradeBinary = 'upgrade/binary', // the `stacks` binary

storage/framework/core/enums/src/index.ts

@@ -16,6 +16,7 @@ export class ErrorHandler {
     if (options?.silent !== false) this.writeErrorToConsole(err)
 
     if (typeof err === 'string') err = new StacksError(err)
+    if (typeof err === 'object') err = err as Error
 
     this.writeErrorToFile(err).catch((e) => console.error(e))
 
@@ -50,10 +51,12 @@ export class ErrorHandler {
     if (
       err === 'Failed to execute command: bunx biome check --fix' ||
       err === 'Failed to execute command: bun --bun storage/framework/core/actions/src/lint/fix.ts'
-    )
+    ) {
       // To trigger this, run `buddy release` with a lint error in your codebase
       console.error(err)
-    process.exit(ExitCode.FatalError) // TODO: abstract this by differently catching the error somewhere
+      process.exit(ExitCode.FatalError) // TODO: abstract this by differently catching the error somewhere
+    }
+
     console.error(err)
   }
 }

storage/framework/core/error-handling/src/handler.ts

@@ -69,7 +69,7 @@ export async function writeToLogFile(message: string) {
 export interface Log {
   info: (...args: any[]) => void
   success: (msg: string) => void
-  error: (err: string | Error | unknown, options?: any | Error) => void
+  error: (err: string | Error | object | unknown, options?: any | Error) => void
   warn: (arg: string) => void
   warning: (arg: string) => void
   debug: (...args: any[]) => void
@@ -112,10 +112,10 @@ export const log: Log = {
   error: (err: unknown, options?: any | Error) => {
     if (err instanceof Error) handleError(err, options)
     else if (err instanceof Error) handleError(options)
+    else if (err instanceof Object) handleError(options)
     else handleError(err, options)
 
     const errorMessage = isString(err) ? err : err instanceof Error ? err.message : String(err)
-    logger.error(errorMessage)
     writeToLogFile(`ERROR: ${errorMessage}`)
   },