stacks 0.58.57 → 0.58.59

package/core/cli/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/cli",
   "type": "module",
-  "version": "0.58.57",
+  "version": "0.58.59",
   "description": "TypeScript framework for CLI artisans. Build beautiful console apps with ease.",
   "author": "Chris Breuer",
   "license": "MIT",

package/core/cli/src/cli.ts

@@ -1,8 +1,7 @@
 // import type { CliOptions } from '@stacksjs/types'
-import cac from 'cac'
-import { version } from '../package.json'
+import { CAC } from 'cac'
 
-interface ParsedArgv {
+export interface ParsedArgv {
   args: ReadonlyArray<string>
   options: {
     [k: string]: any
@@ -11,8 +10,8 @@ interface ParsedArgv {
 
 interface CliOptions {
   name?: string
-  version: string
-  description: string
+  // version: string
+  // description: string
 }
 
 export function cli(name?: string | CliOptions, options?: CliOptions) {
@@ -21,32 +20,11 @@ export function cli(name?: string | CliOptions, options?: CliOptions) {
     name = options.name
   }
 
-  const cli = cac(name || 'buddy') // default to extending buddy
-
-  cli.help()
-  cli.version(options?.version || version)
-
-  return cli
+  return new CAC(name || 'buddy')
 }
 
-export function command(name: string, description: string, options?: CliOptions) {
-  return cli(options).command(name, description)
-}
-
-export function parseArgs() {
-  return cli().parse().args
-}
+export { CAC }
 
-export function parseOptions(): ParsedArgv['options'] {
-  const options = cli().parse().options
-
-  // Iterate over the options and convert "true" and "false" strings to boolean
-  for (const key in options) {
-    if (options[key] === 'true')
-      options[key] = true
-    else if (options[key] === 'false')
-      options[key] = false
-  }
-
-  return options
-}
+// export function command(name: string, description: string, options?: CliOptions) {
+//   return cli(options).command(name, description)
+// }

package/core/cli/src/console.ts

@@ -76,4 +76,4 @@ export class Prompt {
 
 export { prompts, log }
 
-export const prompt = new Prompt()
+export const prompt = () => new Prompt()

package/core/cli/src/exec.ts

@@ -2,6 +2,7 @@ import process from 'node:process'
 import { type Result, err, handleError, ok } from '@stacksjs/error-handling'
 import type { CliOptions, StacksError, Subprocess } from '@stacksjs/types'
 import { ExitCode } from '@stacksjs/types'
+import { log } from './'
 
 /**
  * Execute a command.
@@ -24,19 +25,21 @@ import { ExitCode } from '@stacksjs/types'
  * ```
  */
 export async function exec(command: string | string[], options?: CliOptions): Promise<Result<Subprocess, StacksError>> {
-  const cmd = Array.isArray(command) ? command : command.match(/(?:[^\s"]+|"[^"]*")+/g)
+  const cmd = Array.isArray(command)
+    ? command
+    : command.match(/(?:[^\s"]+|"[^"]*")+/g)
 
   if (!cmd)
     return err(handleError(`Failed to parse command: ${cmd}`, options))
 
-  if (options?.verbose)
-    // eslint-disable-next-line no-console
-    console.log('exec', { command, cmd, options })
+  log.debug('exec:', Array.isArray(command) ? command.join(' ') : command)
+  log.debug('cmd:', cmd)
+  log.debug('exec options:', options)
 
   const proc = Bun.spawn(cmd, {
     ...options,
-    stdout: options?.silent ? 'ignore' : (options?.stdin ? options.stdin : (options?.stdout || 'inherit')),
-    stderr: options?.silent ? 'ignore' : (options?.stderr || 'inherit'),
+    stdout: (options?.silent || options?.quiet) ? 'ignore' : (options?.stdin ? options.stdin : (options?.stdout || 'inherit')),
+    stderr: (options?.silent || options?.quiet) ? 'ignore' : (options?.stderr || 'inherit'),
     detached: options?.background || false,
     cwd: options?.cwd || import.meta.dir,
     // env: { ...e, ...options?.env },
@@ -47,12 +50,12 @@ export async function exec(command: string | string[], options?: CliOptions): Pr
   })
 
   // Check if we need to write to stdin
-  if (options?.stdin === 'pipe' && options.input) {
-    if (proc.stdin) {
-      proc.stdin.write(options.input)
-      proc.stdin.end()
-    }
-  }
+  // if (options?.stdin === 'pipe' && options.input) {
+  //   if (proc.stdin) {
+  //     proc.stdin.write(options.input)
+  //     proc.stdin.end()
+  //   }
+  // }
 
   const exited = await proc.exited
   if (exited === ExitCode.Success)
@@ -78,10 +81,21 @@ export async function exec(command: string | string[], options?: CliOptions): Pr
  * ```
  */
 export async function execSync(command: string | string[], options?: CliOptions): Promise<string> {
-  const cmd = Array.isArray(command) ? command : command.split(' ')
+  log.debug('Running execSync:', command)
+  log.debug('execSync Options:', options)
+
+  const cmd = Array.isArray(command)
+    ? command
+    : command.match(/(?:[^\s"]+|"[^"]*")+/g)
+
+  if (!cmd) {
+    log.error(`Failed to parse command: ${cmd}`, options)
+    process.exit(ExitCode.FatalError)
+  }
+
   const proc = Bun.spawnSync(cmd, {
     ...options,
-    // stdin: 'inherit',
+    stdin: options?.stdin ?? 'inherit',
     stdout: options?.stdout ?? 'pipe',
     stderr: options?.stderr ?? 'inherit',
     cwd: options?.cwd ?? import.meta.dir,

package/core/cli/src/helpers.ts

@@ -61,14 +61,14 @@ export function outro(text: string, options?: OutroOptions, error?: Error | stri
       if (error)
         log.error(`[${time.toFixed(2)}${opts.useSeconds ? 's' : 'ms'}] Failed`)
       else if (opts.type === 'info')
-        console.log(`${dim(gray(`[${time.toFixed(2)}${opts.useSeconds ? 's' : 'ms'}]`))} ${opts.message ?? 'Complete'}`)
+        log.info(`${dim(gray(`[${time.toFixed(2)}${opts.useSeconds ? 's' : 'ms'}]`))} ${opts.message ?? 'Complete'}`)
       else
-        console.log(`${dim(gray(bold(`[${time.toFixed(2)}${opts.useSeconds ? 's' : 'ms'}]`)))} ${bold(green(opts.message ?? 'Complete'))}`)
+        log.success(`${dim(gray(bold(`[${time.toFixed(2)}${opts.useSeconds ? 's' : 'ms'}]`)))} ${bold(green(opts.message ?? 'Complete'))}`)
     }
 
     else {
       if (opts?.type === 'info')
-        console.log(text)
+        log.info(text)
 
       // the following condition triggers in the case of "Cleaned up" messages
       else if (opts?.type === 'success' && opts?.quiet !== true)

package/core/cli/src/index.ts

@@ -7,4 +7,4 @@ export * from './parse'
 export * from './exec'
 export * from './run'
 export * from './spinner'
-export * from './utilities'
+export * from './utils'

package/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,14 +35,14 @@ 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
 }
@@ -47,18 +50,22 @@ function parseLongOption(arg: string, argv: string[], index: number, options: {
 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))
@@ -86,16 +95,85 @@ export function parseArgv(argv?: string[]): ParsedArgv {
   return { args, options }
 }
 
-// export function parseOptions(argv?: string[]): { [k: string]: string | boolean | number } {
-//   if (argv === undefined)
-//     argv = process.argv.slice(2)
-
-//   return parseArgv(argv).options
-// }
-
 export function parseArgs(argv?: string[]): string[] {
   if (argv === undefined)
     argv = process.argv.slice(2)
 
   return parseArgv(argv).args
 }
+
+interface CliOptions {
+  dryRun?: boolean
+  quiet?: boolean
+  verbose?: boolean
+  [k: string]: string | boolean | number | undefined
+}
+
+export function parseOptions(options?: CliOptions): CliOptions | undefined {
+  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) { // if the next arg exists
+        if (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++
+        }
+        else {
+          options[camelCaseKey] = args[i + 1]
+          i++
+        }
+      }
+      else {
+        options[camelCaseKey] = true
+      }
+    }
+  }
+
+  // if options has no keys, return undefined, e.g. `buddy release`
+  if (Object.keys(options).length === 0)
+    return undefined
+
+  // convert the string 'true' or 'false' to a boolean
+  Object.keys(options).forEach((key) => {
+    if (!options)
+      return
+
+    const value = options[key]
+
+    if (value === 'true' || value === 'false')
+      options[key] = value === 'true'
+  })
+
+  return options
+}
+// interface BuddyOptions {
+//   dryRun?: boolean
+//   verbose?: boolean
+// }
+export function buddyOptions(options?: any): string {
+  if (!options) {
+    options = process.argv.slice(2)
+    options = Array.from(new Set(options))
+    // delete the 0 element if it does not start with a -
+    // e.g. is used when buddy changelog --dry-run is used
+    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(' ')
+}

package/core/cli/src/run.ts

@@ -1,7 +1,7 @@
 import type { CliOptions, CommandError, Subprocess } from '@stacksjs/types'
 import type { Result } from '@stacksjs/error-handling'
 import { exec, execSync } from './exec'
-import { italic, underline } from './utilities'
+import { italic } from './utils'
 import { log } from './console'
 
 /**
@@ -30,15 +30,15 @@ import { log } from './console'
  * ```
  */
 export async function runCommand(command: string, options?: CliOptions): Promise<Result<Subprocess, CommandError>> {
-  if (options?.verbose)
-    log.debug('Running command:', underline(italic(command)), 'with options:', options)
+  log.debug('runCommand:', command)
+  log.debug('options:', options)
 
   return await exec(command, options)
 }
 
 export async function runProcess(command: string, options?: CliOptions): Promise<Result<Subprocess, CommandError>> {
-  if (options?.verbose)
-    log.debug('Running command:', underline(italic(command)), 'with options:', options)
+  log.debug('runProcess:', italic(command))
+  log.debug('runProcess Options:', options)
 
   return await exec(command, options)
 }
@@ -69,8 +69,8 @@ export async function runProcess(command: string, options?: CliOptions): Promise
  * ```
  */
 export async function runCommandSync(command: string, options?: CliOptions): Promise<string> {
-  if (options?.verbose)
-    log.debug('Running command:', underline(italic(command)), 'with options:', options)
+  log.debug('runCommandSync:', italic(command))
+  log.debug('runCommandSync Options:', options)
 
   const result = await execSync(command, options)
 

package/core/cli/src/utils.ts

@@ -0,0 +1,62 @@
+export * as kolorist from 'kolorist'
+
+export {
+  stripAnsi,
+  centerAlign,
+  rightAlign,
+  leftAlign,
+  align,
+  box,
+  colors,
+  getColor,
+  colorize,
+} from 'consola/utils'
+
+export {
+  ansi256Bg,
+  bgBlack,
+  bgBlue,
+  bgCyan,
+  bgGray,
+  bgGreen,
+  bgLightBlue,
+  bgLightCyan,
+  bgLightGray,
+  bgLightGreen,
+  bgLightMagenta,
+  bgLightRed,
+  bgLightYellow,
+  bgMagenta,
+  bgRed,
+  bgWhite,
+  bgYellow,
+  black,
+  blue,
+  bold,
+  cyan,
+  dim,
+  gray,
+  green,
+  hidden,
+  inverse,
+  italic,
+  lightBlue,
+  lightCyan,
+  lightGray,
+  lightGreen,
+  lightMagenta,
+  lightRed,
+  lightYellow,
+  link,
+  magenta,
+  red,
+  reset,
+  strikethrough,
+  underline,
+  white,
+  yellow,
+  ansi256,
+  trueColor,
+  trueColorBg,
+  stripColors,
+} from 'kolorist'

package/core/cloud/dist/index.js

@@ -1810,46 +1810,25 @@ class QueueStack {
   }
   async init() {
     const jobsDir = path6.jobsPath();
-    try {
-      const files = await fs.readdir(jobsDir);
-      for (const file of files) {
-        if (file.endsWith(".ts")) {
-          const filePath = path6.jobsPath(file);
-          const jobModule = await this.loadJobModule(filePath);
-          const rate = jobModule.default.rate || "* * * * *";
-          const schedule = Schedule.cron(this.cronScheduleFromRate(rate));
-          const id = `QueueRule${pascalCase(file.replace(".ts", ""))}`;
-          const rule = new Rule(this.scope, id, {
-            ruleName: `${this.props.appName}-${this.props.appEnv}-queue-rule-${slug2(file.replace(".ts", ""))}`,
-            schedule
-          });
-          rule.addTarget(new EcsTask({
-            cluster: this.props.cluster,
-            taskDefinition: this.props.taskDefinition,
-            containerOverrides: [
-              {
-                containerName: `${this.props.appName}-${this.props.appEnv}-api`,
-                environment: [
-                  {
-                    name: "QUEUE_WORKER",
-                    value: "true"
-                  },
-                  {
-                    name: "JOB",
-                    value: file
-                  }
-                ]
-              }
-            ],
-            retryAttempts: 3,
-            subnetSelection: {
-              subnetType: ec24.SubnetType.PUBLIC
-            }
-          }));
-        }
-      }
-    } catch (err2) {
-      console.error("Error reading the jobs directory:", err2);
+    const actionsDir = path6.appPath("Actions");
+    const jobFiles = await fs.readdir(jobsDir);
+    const actionFiles = await fs.readdir(actionsDir);
+    const jobs = [];
+    for (const file of jobFiles) {
+      if (!file.endsWith(".ts"))
+        continue;
+      const jobPath = path6.jobsPath(file);
+      const job = await this.loadModule(jobPath);
+      this.createQueueRule(job, file);
+      jobs.push(job);
+    }
+    for (const file of actionFiles) {
+      if (!file.endsWith(".ts"))
+        continue;
+      const actionPath = path6.appPath(`Actions/${file}`);
+      const action = await this.loadModule(actionPath);
+      this.createQueueRule(action, file);
+      jobs.push(action);
     }
   }
   cronScheduleFromRate(rate) {
@@ -1862,10 +1841,60 @@ class QueueStack {
       year: parts[4]
     };
   }
-  async loadJobModule(filePath) {
+  async loadModule(filePath) {
     const jobModule = await import(filePath);
     return jobModule;
   }
+  createQueueRule(module, file) {
+    const rate = module.default?.rate;
+    if (!rate || module.default?.enabled === false)
+      return;
+    const schedule = Schedule.cron(this.cronScheduleFromRate(rate));
+    const id = `QueueRule${pascalCase(file.replace(".ts", ""))}`;
+    const rule = new Rule(this.scope, id, {
+      ruleName: `${this.props.appName}-${this.props.appEnv}-queue-rule-${slug2(file.replace(".ts", ""))}`,
+      schedule
+    });
+    rule.addTarget(new EcsTask({
+      cluster: this.props.cluster,
+      taskDefinition: this.props.taskDefinition,
+      containerOverrides: [
+        {
+          containerName: `${this.props.appName}-${this.props.appEnv}-api`,
+          environment: [
+            {
+              name: "QUEUE_WORKER",
+              value: "true"
+            },
+            {
+              name: "JOB",
+              value: file
+            },
+            {
+              name: "JOB_BACKOFF_FACTOR",
+              value: module.default?.backoffFactor
+            },
+            {
+              name: "JOB_RETRIES",
+              value: module.default?.tries
+            },
+            {
+              name: "JOB_INITIAL_DELAY",
+              value: module.default?.initialDelay
+            },
+            {
+              name: "JOB_JITTER",
+              value: module.default?.jitter
+            }
+          ]
+        }
+      ],
+      retryAttempts: 1,
+      subnetSelection: {
+        subnetType: ec24.SubnetType.PUBLIC
+      }
+    }));
+  }
 }
 
 // src/cloud/index.ts

package/core/cloud/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/cloud",
   "type": "module",
-  "version": "0.58.57",
+  "version": "0.58.59",
   "description": "The Stacks cloud/serverless integration & implementation.",
   "author": "Chris Breuer",
   "license": "MIT",
@@ -55,19 +55,19 @@
     "prepublishOnly": "bun run build"
   },
   "peerDependencies": {
-    "@aws-sdk/client-bedrock": "^3.507.0",
-    "@aws-sdk/client-cloudformation": "^3.507.0",
-    "@aws-sdk/client-cloudfront": "^3.507.0",
-    "@aws-sdk/client-cloudwatch-logs": "^3.508.0",
-    "@aws-sdk/client-ec2": "^3.507.0",
-    "@aws-sdk/client-efs": "^3.507.0",
-    "@aws-sdk/client-iam": "^3.507.0",
-    "@aws-sdk/client-lambda": "^3.507.0",
-    "@aws-sdk/client-route-53-domains": "^3.507.0",
-    "@aws-sdk/client-s3": "^3.507.0",
-    "@aws-sdk/client-ses": "^3.507.0",
-    "@aws-sdk/client-sesv2": "^3.507.0",
-    "@aws-sdk/client-ssm": "^3.507.0",
+    "@aws-sdk/client-bedrock": "^3.511.0",
+    "@aws-sdk/client-cloudformation": "^3.511.0",
+    "@aws-sdk/client-cloudfront": "^3.511.0",
+    "@aws-sdk/client-cloudwatch-logs": "^3.511.0",
+    "@aws-sdk/client-ec2": "^3.511.0",
+    "@aws-sdk/client-efs": "^3.511.0",
+    "@aws-sdk/client-iam": "^3.511.0",
+    "@aws-sdk/client-lambda": "^3.511.0",
+    "@aws-sdk/client-route-53-domains": "^3.511.0",
+    "@aws-sdk/client-s3": "^3.511.0",
+    "@aws-sdk/client-ses": "^3.511.0",
+    "@aws-sdk/client-sesv2": "^3.511.0",
+    "@aws-sdk/client-ssm": "^3.511.0",
     "@stacksjs/config": "workspace:*",
     "@stacksjs/env": "workspace:*",
     "@stacksjs/logging": "workspace:*",
@@ -79,20 +79,20 @@
     "@stacksjs/validation": "workspace:*"
   },
   "dependencies": {
-    "@aws-sdk/client-bedrock": "^3.507.0",
-    "@aws-sdk/client-cloudformation": "^3.507.0",
-    "@aws-sdk/client-cloudfront": "^3.507.0",
-    "@aws-sdk/client-cloudwatch-logs": "^3.508.0",
-    "@aws-sdk/client-dynamodb": "3.507.0",
-    "@aws-sdk/client-ec2": "^3.507.0",
-    "@aws-sdk/client-efs": "^3.507.0",
-    "@aws-sdk/client-iam": "^3.507.0",
-    "@aws-sdk/client-lambda": "^3.507.0",
-    "@aws-sdk/client-route-53-domains": "^3.507.0",
-    "@aws-sdk/client-s3": "^3.507.0",
-    "@aws-sdk/client-ses": "^3.507.0",
-    "@aws-sdk/client-sesv2": "^3.507.0",
-    "@aws-sdk/client-ssm": "^3.507.0",
+    "@aws-sdk/client-bedrock": "^3.511.0",
+    "@aws-sdk/client-cloudformation": "^3.511.0",
+    "@aws-sdk/client-cloudfront": "^3.511.0",
+    "@aws-sdk/client-cloudwatch-logs": "^3.511.0",
+    "@aws-sdk/client-dynamodb": "3.511.0",
+    "@aws-sdk/client-ec2": "^3.511.0",
+    "@aws-sdk/client-efs": "^3.511.0",
+    "@aws-sdk/client-iam": "^3.511.0",
+    "@aws-sdk/client-lambda": "^3.511.0",
+    "@aws-sdk/client-route-53-domains": "^3.511.0",
+    "@aws-sdk/client-s3": "^3.511.0",
+    "@aws-sdk/client-ses": "^3.511.0",
+    "@aws-sdk/client-sesv2": "^3.511.0",
+    "@aws-sdk/client-ssm": "^3.511.0",
     "@stacksjs/config": "workspace:*",
     "@stacksjs/dns": "workspace:*",
     "@stacksjs/env": "workspace:*",
@@ -102,18 +102,18 @@
     "@stacksjs/storage": "workspace:*",
     "@stacksjs/utils": "workspace:*",
     "@stacksjs/validation": "workspace:*",
-    "aws-cdk": "^2.126.0",
-    "aws-cdk-lib": "^2.126.0",
+    "aws-cdk": "^2.127.0",
+    "aws-cdk-lib": "^2.127.0",
     "aws4fetch": "^1.0.17",
     "constructs": "^10.3.0"
   },
   "devDependencies": {
-    "@oclif/plugin-plugins": "^4.2.1",
+    "@oclif/plugin-plugins": "^4.2.2",
     "@stacksjs/cli": "workspace:*",
     "@stacksjs/development": "workspace:*",
     "@stacksjs/env": "workspace:*",
     "jszip": "^3.10.1",
-    "oclif": "^4.4.7",
+    "oclif": "^4.4.10",
     "source-map-support": "^0.5.21"
   }
 }