chore: wip

Author: chrisbbreuer

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

@@ -1,7 +1,7 @@
 import * as storage from '@stacksjs/storage'
 import { italic, runCommand, runCommands } from '@stacksjs/cli'
 import { log } from '@stacksjs/logging'
-import { actionsPath, functionsPath } from '@stacksjs/path'
+import * as p from '@stacksjs/path'
 import { type ActionOptions, type StacksError, type SyncSubprocess } from '@stacksjs/types'
 import { type Result, err, handleError } from '@stacksjs/error-handling'
 
@@ -36,14 +36,20 @@ export function runAction(action: string, options?: ActionOptions): Result<SyncS
   if (!hasAction(action))
     return err(handleError(`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 = `bun --bun ${actionsPath(`${action}.ts ${opts}`)}`
+  const path = p.relativeActionsPath(`${action}.ts`)
+  const cmd = `bun --bun ${`${path} ${opts}`}`
 
   if (options?.verbose)
     log.debug('Running action:', italic(action))
 
-  return runCommand(cmd, options)
+  if (options?.cwd)
+    return runCommand(cmd, options)
+
+  return runCommand(cmd, {
+    cwd: p.projectPath(),
+    ...options
+  })
 }
 
 /**
@@ -63,14 +69,14 @@ export function runActions(actions: string[], options?: ActionOptions) {
       return err(`The specified action "${action}" does not exist`)
   }
 
-  const commands = actions.map(action => `bun ${actionsPath(`${action}.ts`)}`)
+  const commands = actions.map(action => `bun ${p.actionsPath(`${action}.ts`)}`)
 
   return runCommands(commands, options)
 }
 
 export function hasAction(action: string) {
-  if (storage.isFile(functionsPath(`actions/${action}.ts`)))
+  if (storage.isFile(p.functionsPath(`actions/${action}.ts`)))
     return true
 
-  return storage.isFile(actionsPath(`${action}.ts`))
+  return storage.isFile(p.actionsPath(`${action}.ts`))
 }

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

@@ -1,7 +1,8 @@
 import process from 'node:process'
-import { type CLI, type FreshOptions } from '@stacksjs/types'
+import type { CLI, FreshOptions } from '@stacksjs/types'
 import { runAction } from '@stacksjs/actions'
 import { intro, outro } from '@stacksjs/cli'
+import { projectPath } from '@stacksjs/path'
 import { Action, ExitCode } from '@stacksjs/types'
 
 export function fresh(buddy: CLI) {
@@ -18,7 +19,7 @@ export function fresh(buddy: CLI) {
       const result = runAction(Action.Fresh, options)
 
       if (result.isErr()) {
-        await outro('While running the `fresh` command, there was an issue', { startTime: perf, useSeconds: true, isError: true }, result.error as Error)
+        await outro('While running the `fresh` command, there was an issue', { startTime: perf, useSeconds: true, isError: true }, result.error)
         process.exit(ExitCode.FatalError)
       }
 

.stacks/core/cli/package.json

@@ -33,10 +33,12 @@
   ],
   "exports": {
     ".": {
-      "bun": "./src/index.ts"
+      "bun": "./src/index.ts",
+      "import": "./dist/index.js"
     },
     "./*": {
-      "bun": "./*"
+      "bun": "./*",
+      "import": "./dist/*"
     }
   },
   "module": "dist/index.js",

.stacks/core/cli/src/helpers.ts

@@ -1,16 +1,13 @@
 /* eslint-disable no-console */
 import { ExitCode, type IntroOptions, type OutroOptions } from '@stacksjs/types'
+import { handleError } from '@stacksjs/error-handling'
 import { log } from '@stacksjs/logging'
 import pkgjson from '../package.json'
 import { spinner } from './spinner'
 import { bgCyan, bold, cyan, dim, italic } from './utilities'
 
 const { version } = pkgjson
 
-function isString(val: unknown): val is string {
-  return typeof val === 'string'
-}
-
 /**
  * Prints the intro message.
  */
@@ -40,7 +37,7 @@ export function outro(text: string, options: OutroOptions, error?: Error | strin
   return new Promise((resolve) => {
     if (options.isError) {
       if (error)
-        log.error(isString(error) ? new Error(error) : error)
+        handleError(error)
     }
     else {
       if (options?.type === 'info')

.stacks/core/error-handling/src/handler.ts

@@ -8,9 +8,13 @@ import { italic, log } from '@stacksjs/cli'
 export class ErrorHandler {
   static logFile = logsPath('errors.log')
 
-  static handle(err: StacksError, options?: any) {
+  static handle(err: string | StacksError, options?: any) {
+    if (typeof err === 'string')
+      err = new Error(err)
+
     this.writeErrorToConsole(err, options)
     this.writeErrorToFile(err)
+
     return err
   }
 

.stacks/core/path/src/index.ts

@@ -19,6 +19,10 @@ export function actionsPath(path?: string) {
   return corePath(`actions/src/${path || ''}`)
 }
 
+export function relativeActionsPath(path?: string) {
+  return relative(projectPath(), actionsPath(path))
+}
+
 /**
  * Returns the path to the `ai` directory. The AI directory
  * contains the core Stacks' AI logic which currently
@@ -411,6 +415,7 @@ export function xRayPath(path?: string) {
 export const path = {
   aiPath,
   actionsPath,
+  relativeActionsPath,
   aliasPath,
   analyticsPath,
   arraysPath,

.stacks/tsconfig.json

@@ -40,13 +40,13 @@
       "buddy/*": ["./core/buddy/src/*"],
       "eslint-plugin-stacks": ["./eslint-plugin-stacksjs/src/index.ts"],
       "eslint-plugin-stacksjs": ["./eslint-plugin-stacksjs/src/index.ts"],
-      "~/app/*": ["../app/*"],
-      "~/config/*": ["../config/*"],
+      // "~/app/*": ["../app/*"],
+      // "~/config/*": ["../config/*"],
       "~/components/*": ["../resources/components/*"],
       "~/functions/*": ["../resources/functions/*"],
-      "~/lang/*": ["../lang/*"],
+      // "~/lang/*": ["../lang/*"],
       "~/models/*": ["../app/models/*"],
-      "~/resources/*": ["../resources/*"],
+      // "~/resources/*": ["../resources/*"],
       "~/views/*": ["../resources/views/*"],
       "~/*": ["../*"]
     }
@@ -59,7 +59,10 @@
   },
   "include": [
     "./playwright.config.ts",
-    "./**.d.ts",
+    "../*.ts",
+    "../*.d.ts",
+    "../**/*.ts",
+    "../**/*.d.ts",
     "./views/**/*",
     "./stacks/**/*",
     "./scripts/**/*",