chore: wip

chore: wip

Author: chrisbbreuer

storage/framework/core/actions/src/helpers/utils.ts

@@ -17,7 +17,7 @@ export async function runAction(action: string, options?: ActionOptions): Promis
   if (!hasAction(action))
     return err(handleError(`The specified action "${action}" does not exist`))
 
-  const opts = buddyOptions()
+  const opts = parseOptions()
   const path = p.relativeActionsPath(`${action}.ts`)
   const cmd = `bun --bun ${path} ${opts}`
   const optionsWithCwd = {
@@ -51,7 +51,6 @@ export async function runActions(actions: string[], options?: ActionOptions) {
       return err(`The specified action "${action}" does not exist`)
   }
 
-  // TODO: need to solve this error
   const opts = buddyOptions()
 
   const o = {

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

@@ -23,7 +23,10 @@ export function release(buddy: CLI) {
         log.warn('Dry run enabled. No changes will be made.')
 
       const startTime = await intro('buddy release')
-      const result = await runAction(Action.Release, { ...options, stdin: 'inherit' })
+      const result = await runAction(Action.Release, {
+        stdin: 'inherit',
+        ...options,
+      })
 
       if (result.isErr()) {
         log.error('Failed to release', result.error)

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

@@ -7,7 +7,10 @@ interface ParsedArgv {
   }
 }
 
-function isLongOption(arg: string): boolean {
+function isLongOption(arg?: string): boolean {
+  if (!arg)
+    return false
+
   return arg.startsWith('--')
 }
 
@@ -32,33 +35,37 @@ function parseValue(value: string): string | boolean | number {
 function parseLongOption(arg: string, argv: string[], index: number, options: { [k: string]: string | boolean | number }): number {
   const [key, value] = arg.slice(2).split('=')
   if (value !== undefined) {
-    options[key] = parseValue(value)
+    options[key as string] = parseValue(value)
   }
-  else if (index + 1 < argv.length && !argv[index + 1].startsWith('-')) {
-    options[key] = argv[index + 1]
+  else if (index + 1 < argv.length && !argv[index + 1]!.startsWith('-')) {
+    options[key as string] = argv[index + 1] as string
     index++
   }
   else {
-    options[key] = true
+    options[key as string] = true
   }
   return index
 }
 
 function parseShortOption(arg: string, argv: string[], index: number, options: { [k: string]: string | boolean | number }): number {
   const [key, value] = arg.slice(1).split('=')
 
-  if (value !== undefined) {
+  // Check if key is undefined and handle it
+  if (key === undefined)
+    return index
+
+  if (value !== undefined && key !== undefined) {
     for (let j = 0; j < key.length; j++)
-      options[key[j]] = parseValue(value)
+      options[key[j] as string] = parseValue(value)
   }
   else {
     for (let j = 0; j < key.length; j++) {
-      if (index + 1 < argv.length && j === key.length - 1 && !argv[index + 1].startsWith('-')) {
-        options[key[j]] = parseValue(argv[index + 1])
+      if (index + 1 < argv.length && j === key.length - 1 && !argv[index + 1]!.startsWith('-')) {
+        options[key[j] as string] = parseValue(argv[index + 1]!)
         index++
       }
       else {
-        options[key[j]] = true
+        options[key[j] as string] = true
       }
     }
   }
@@ -75,6 +82,8 @@ export function parseArgv(argv?: string[]): ParsedArgv {
 
   for (let i = 0; i < argv.length; i++) {
     const arg = argv[i]
+    if (!arg)
+      continue
     if (isLongOption(arg))
       i = parseLongOption(arg, argv, i, options)
     else if (isShortOption(arg))
@@ -102,11 +111,14 @@ export function parseOptions(options?: CliOptions): object {
   if (!options) {
     options = {}
     const args = process.argv.slice(2)
+
     for (let i = 0; i < args.length; i++) {
       const arg = args[i]
+
       if (arg?.startsWith('--')) {
         const key = arg.substring(2) // remove the --
         const camelCaseKey = key.replace(/-([a-z])/gi, g => (g[1] ? g[1].toUpperCase() : '')) // convert kebab-case to camelCase
+
         if (i + 1 < args.length && (args[i + 1] === 'true' || args[i + 1] === 'false')) { // if the next arg is a boolean
           options[camelCaseKey] = args[i + 1] === 'true' // set the value to the boolean
           i++
@@ -116,6 +128,7 @@ export function parseOptions(options?: CliOptions): object {
         }
       }
     }
+
     return options
   }
 
@@ -134,6 +147,10 @@ export function parseOptions(options?: CliOptions): object {
   return options
 }
 
+// interface BuddyOptions {
+//   dryRun?: boolean
+//   verbose?: boolean
+// }
 export function buddyOptions(options?: any): string {
   if (!options) {
     options = process.argv.slice(2)
@@ -143,10 +160,12 @@ export function buddyOptions(options?: any): string {
     if (options[0] && !options[0].startsWith('-'))
       options.shift()
   }
+
   if (options?.verbose) {
     log.debug('process.argv', process.argv)
     log.debug('process.argv.slice(2)', process.argv.slice(2))
     log.debug('options inside buddyOptions', options)
   }
+
   return options.join(' ')
 }

storage/framework/core/router/src/router.ts

@@ -1,8 +1,8 @@
 import type { RedirectCode, Route, RouteGroupOptions, StatusCode } from '@stacksjs/types'
-import { projectPath } from '@stacksjs/path'
+import { path as p, projectPath } from '@stacksjs/path'
 
 export interface RouterInterface {
-  get: (url: Route['url'], callback: Route['callback']) => this
+  get: (url: Route['url'], callback: Route['callback']) => Promise<this>
   post: (url: Route['url'], callback: Route['callback']) => this
   view: (url: Route['url'], callback: Route['callback']) => this
   redirect: (url: Route['url'], callback: Route['callback'], status?: RedirectCode) => this
@@ -46,7 +46,14 @@ export class Router implements RouterInterface {
     })
   }
 
-  public get(path: Route['url'], callback: Route['callback']): this {
+  public async get(path: Route['url'], callback: Route['callback']): Promise<this> {
+    // check if callback is a string and if it is, then import that module path and use the default.handle function as the callback
+    if (typeof callback === 'string') {
+      // import the module and use the default.handle function as the callback
+      const actionModule = await import(p.actionsPath(`${callback}.ts`))
+      callback = actionModule.default.handle
+    }
+
     this.addRoute('GET', path, callback, 200)
     return this
   }

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

@@ -1,6 +1,6 @@
 import type { BunFile } from 'bun'
 
-type ArrayBufferView = TypedArray | DataView
+type ArrayBufferView = NodeJS.TypedArray | DataView
 
 export type { Subprocess, SyncSubprocess } from 'bun'
 export type Readable =

storage/framework/core/types/src/router.ts

@@ -34,13 +34,14 @@ export type HttpMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'before'
 
 export type RouteCallback = (params?: Record<string, any>) => any | string | object
 
+type ActionName = string
 export interface Route {
   name: string
   uri: string
   url: string // used synonymously with uri
   method: HttpMethod
   pattern: RegExp
-  callback: RouteCallback
+  callback: RouteCallback | ActionName
   paramNames: string[]
   middleware?: string | string[]
   statusCode?: StatusCode