chore: wip

Author: chrisbbreuer

.stacks/core/actions/src/deploy/domains.ts

@@ -1,6 +1,6 @@
-import { parseArgs } from '@stacksjs/cli'
+import { parseOptions } from '@stacksjs/cli'
 
-const options = parseArgs(process.argv.slice(2))
+const options = parseOptions()
 
 console.log('options', options)
 

.stacks/core/buddy/src/cli.ts

@@ -7,7 +7,7 @@ import { Action } from '@stacksjs/types'
 import { filesystem } from '@stacksjs/storage'
 import { build, changelog, clean, commit, create, dev, example, fresh, generate, key, lint, make, migrate, preinstall, prepublish, release, seed, setup, test, upgrade, version } from './commands'
 
-const cli = command('stacks')
+const cli = command('buddy')
 const { fs } = filesystem
 
 // setup global error handlers

.stacks/core/cli/src/parse.ts

@@ -1,3 +1,99 @@
-import mri from 'mri'
+interface ParsedArgv {
+  args: ReadonlyArray<string>
+  options: {
+    [k: string]: string | boolean | number
+  }
+}
 
-export const parseArgs = (argv: string[]) => mri(argv)
+function isLongOption(arg: string): boolean {
+  return arg.startsWith('--')
+}
+
+function isShortOption(arg: string): boolean {
+  return arg.startsWith('-') && !isLongOption(arg)
+}
+
+function parseValue(value: string): string | boolean | number {
+  if (value === 'true')
+    return true
+
+  if (value === 'false')
+    return false
+
+  const numberValue = parseFloat(value)
+  if (!isNaN(numberValue))
+    return numberValue
+
+  return value.replace(/"/g, '')
+}
+
+function parseLongOption(arg: string, argv: ReadonlyArray<string>, index: number, options: { [k: string]: string | boolean | number }): number {
+  const [key, value] = arg.slice(2).split('=')
+  if (value !== undefined) {
+    options[key] = parseValue(value)
+  }
+  else if (index + 1 < argv.length && !argv[index + 1].startsWith('-')) {
+    options[key] = argv[index + 1]
+    index++
+  }
+  else {
+    options[key] = true
+  }
+  return index
+}
+
+function parseShortOption(arg: string, argv: ReadonlyArray<string>, index: number, options: { [k: string]: string | boolean | number }): number {
+  const [key, value] = arg.slice(1).split('=')
+
+  if (value !== undefined) {
+    for (let j = 0; j < key.length; j++)
+      options[key[j]] = 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])
+        index++
+      }
+      else {
+        options[key[j]] = true
+      }
+    }
+  }
+
+  return index
+}
+
+export function parseArgv(argv?: ReadonlyArray<string>): ParsedArgv {
+  if (argv === undefined)
+    argv = process.argv.slice(2)
+
+  const args: string[] = []
+  const options: { [k: string]: string | boolean | number } = {}
+
+  for (let i = 0; i < argv.length; i++) {
+    const arg = argv[i]
+    if (isLongOption(arg))
+      i = parseLongOption(arg, argv, i, options)
+    else if (isShortOption(arg))
+      i = parseShortOption(arg, argv, i, options)
+    else
+      args.push(arg)
+  }
+
+  return { args, options }
+}
+
+export function parseOptions(argv?: ReadonlyArray<string>): { [k: string]: string | boolean | number } {
+  if (argv === undefined)
+    argv = process.argv.slice(2)
+
+  return parseArgv(argv).options
+}
+
+export function parseArgs(argv?: ReadonlyArray<string>): ReadonlyArray<string> {
+  if (argv === undefined)
+    argv = process.argv.slice(2)
+
+  return parseArgv(argv).args
+}

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

@@ -2,6 +2,7 @@ import { execSync as childExec } from 'node:child_process'
 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/cli'
 import { determineDebugLevel } from '@stacksjs/utils'
 import { spawn } from './command'
 import { startSpinner } from './helpers'
@@ -23,7 +24,7 @@ export function exec(command: string, options?: CliOptions): CommandResult {
   return ResultAsync.fromPromise(
     spawn(command, { stdio, cwd, shell }),
     // () => new Error(`Failed to run command: ${italic(command)}`),
-    () => new Error(`Failed to run command: ${italic(command)}`),
+    () => log.error(new Error(`Failed to run command: ${italic(command)}`)),
   )
 }