@stacksjs/buddy 0.58.73 → 0.59.2

package/src/commands/ports.ts

@@ -1,10 +1,12 @@
 import process from 'node:process'
-import type { CLI, CheckOptions } from '@stacksjs/types'
+import type { CLI, Ports, PortsOptions } from '@stacksjs/types'
 import { ExitCode } from '@stacksjs/types'
 import { ports as projectPorts } from '@stacksjs/config'
 import { log } from '@stacksjs/logging'
+import { findProjectPath, path as p, projectPath } from '@stacksjs/path'
 import { $ } from 'bun'
-import { intro, italic, outro } from 'stacks/cli'
+import { intro, italic, outro } from '@stacksjs/cli'
+import { findStacksProjects } from '@stacksjs/utils'
 
 export function ports(buddy: CLI) {
   const descriptions = {
@@ -16,10 +18,12 @@ export function ports(buddy: CLI) {
 
   buddy
     .command('ports', descriptions.command)
-    .option('-p, --project [name]', descriptions.project, { default: '' })
+    .option('-l, --list', 'List the used ports', { default: true })
+    .option('-c, --check', 'Check if the ports are available', { default: false })
+    .option('-p, --project [name]', descriptions.project, { default: undefined })
     .option('-q, --quiet', 'Use minimal output', { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
-    .action(async (options: CheckOptions) => {
+    .action(async (options: PortsOptions) => {
       log.debug('Running `buddy ports` ...', options)
 
       let perf
@@ -27,41 +31,89 @@ export function ports(buddy: CLI) {
         perf = await intro('buddy ports')
 
       if (options.project) {
-        if (!options.quiet)
-          log.info(`Checking ports for project: ${italic(options.project)}`)
+        const path = await findProjectPath(options.project)
+        log.debug(`Path: ${path}`)
+
+        const ports = await getPortsForProjectPath(path, options)
+        log.debug(`./buddy ports --quiet response for ${projectPath}`, ports)
 
-        const projectList = await $`./buddy projects:list --quiet`.text()
-        log.debug('projectList', projectList)
+        outputPorts(ports, options)
+      }
 
-        const projects = projectList.split('\n').filter(line => line.startsWith('   - ')).map(line => line.trim().substring(4))
-        log.debug('projects', projects)
+      // use the user config ports
+      else {
+        outputPorts(projectPorts, options)
+      }
+
+      if (!options.quiet)
+        await outro('Exited', { startTime: perf, useSeconds: false })
 
-        const projectPath = projects.find(project => project.includes(options.project as string)) || ''
-        log.debug('projectPath', projectPath)
+      process.exit(ExitCode.Success)
+    })
 
-        $.cwd(projectPath.startsWith('/') ? projectPath : `/${projectPath}`)
+  buddy
+    .command('ports:list', descriptions.ports)
+    .option('-p, --project [name]', descriptions.project, { default: undefined })
+    .option('-q, --quiet', 'Use minimal output', { default: false })
+    .option('--verbose', descriptions.verbose, { default: false })
+    .action(async (options: PortsOptions) => {
+      log.debug('Running `buddy ports:list` ...', options)
 
-        const res = (await $`./buddy ports --quiet`.text()).trim()
-        log.debug(`./buddy ports --quiet response for ${projectPath}`, res)
+      let perf
+      if (!options.quiet)
+        perf = await intro('buddy ports:list')
 
-        // eslint-disable-next-line no-console
-        console.log('')
-        // eslint-disable-next-line no-console
-        console.log(res)
-        // eslint-disable-next-line no-console
-        console.log('')
+      // return the ports for the project
+      if (options.project) {
+        if (!options.quiet)
+          log.info(`Listing ports for project: ${italic(options.project)}`)
+
+        const path = await findProjectPath(options.project)
+
+        log.debug(`Path: ${path}`)
+
+        const ports = await getPortsForProjectPath(path, options)
+
+        outputPorts(ports, options)
       }
+      // return the used ports for all projects
       else {
-        // eslint-disable-next-line no-console
-        console.log('')
-        // eslint-disable-next-line no-console
-        console.log(projectPorts)
-        // eslint-disable-next-line no-console
-        console.log('')
+        outputPorts(projectPorts, options)
       }
 
       if (!options.quiet)
-        await outro('Exited', { startTime: perf, useSeconds: true })
+        await outro('Exited', { startTime: perf, useSeconds: false })
+
+      process.exit(ExitCode.Success)
+    })
+
+  buddy
+    .command('ports:check', descriptions.ports)
+    .option('-p, --project [name]', descriptions.project, { default: projectPath() })
+    .option('-q, --quiet', 'Use minimal output', { default: false })
+    .option('--verbose', descriptions.verbose, { default: false })
+    .action(async (options: PortsOptions) => {
+      log.debug('Running `buddy ports:check` ...', options)
+
+      let perf
+      if (!options.quiet)
+        perf = await intro('buddy ports:check')
+
+      const projects = await findStacksProjects(undefined, { quiet: true })
+
+      log.debug('Running `buddy ports`')
+      log.debug(`Found ${projects.length} projects`)
+      log.debug('Projects:', projects)
+
+      // need to loop over the projects and then trigger `buddy ports` for each project (which returns a list of ports)
+      const projectsPorts: { [project: string]: Ports } = {}
+      for (const project of projects)
+        projectsPorts[project] = await getPortsForProjectPath(project, options)
+
+      log.info('ProjectsPorts:', projectsPorts)
+
+      if (!options.quiet)
+        await outro('Exited', { startTime: perf, useSeconds: false })
 
       process.exit(ExitCode.Success)
     })
@@ -71,3 +123,58 @@ export function ports(buddy: CLI) {
     process.exit(1)
   })
 }
+
+async function getPortsForProjectPath(path: string, options: PortsOptions) {
+  if (!options.quiet)
+    log.info(`Checking ports for project: ${italic(path)}`)
+
+  $.cwd(path)
+  // load the .env file for the project
+  $.env(await import(`${path}/.env`))
+
+  const projectList = await $`./buddy projects:list --quiet`.text()
+  log.debug('ProjectListResponse', projectList)
+
+  // get the list of all Stacks project paths (on the system)
+  const projects = projectList.split('\n').filter(line => line.startsWith('   - ')).map(line => line.trim().substring(4))
+  log.debug('Projects:', projects)
+
+  // since we are targeting a specific project, find its path
+  const ppath = options.project ?? p.projectPath()
+  let projectPath = projects.find(project => project.includes(ppath))
+
+  log.debug(`Checking ports for project: ${projectPath}`)
+  if (projectPath === '' || !projectPath) // default to the current project
+    projectPath = p.projectPath()
+
+  log.debug(`$ Running: ./buddy ports:list --quiet via ${projectPath}`)
+  const response = (await $`./buddy ports:list --quiet`.json())
+
+  log.debug(`Response for ./buddy ports:list --quiet via ${projectPath}`, response)
+
+  // Step 1: Add double quotes around keys
+  let validJsonString = response.replace(/(\w+)(?=\s*:)/g, '"$1"')
+
+  // Step 2: Remove potential trailing commas before closing braces
+  validJsonString = validJsonString.replace(/,(\s*})/g, '$1')
+
+  // Now we can parse it into an object
+  const ports = JSON.parse(validJsonString) as Ports
+
+  log.debug(`Ports for ${projectPath}`, ports)
+
+  return ports
+}
+
+function outputPorts(ports: Ports, options: PortsOptions) {
+  if (!options.quiet)
+  // eslint-disable-next-line no-console
+    console.log('')
+
+  // eslint-disable-next-line no-console
+  console.log(ports)
+
+  if (!options.quiet)
+  // eslint-disable-next-line no-console
+    console.log('')
+}

package/src/commands/prepublish.ts

@@ -2,7 +2,7 @@ import process from 'node:process'
 import type { CLI, PrepublishOptions } from '@stacksjs/types'
 import { Action } from '@stacksjs/enums'
 import { runAction } from '@stacksjs/actions'
-import { log } from 'stacks/logging'
+import { log } from '@stacksjs/logging'
 
 export function prepublish(buddy: CLI) {
   const descriptions = {

package/src/commands/projects.ts

@@ -38,11 +38,10 @@ export function projects(buddy: CLI) {
     .action(async (options: ProjectsOptions) => {
       log.debug('Running `buddy projects` ...', options)
 
-      await intro('buddy projects:list')
-
       if (!options.quiet)
-        await intro('buddy projects')
+        await intro('buddy projects:list')
 
+      // uses os.homedir() as the default path
       const projects = await findStacksProjects(undefined, options)
 
       for (const project of projects)

package/src/commands/setup.ts

@@ -2,6 +2,7 @@ import process from 'node:process'
 import { path as p } from '@stacksjs/path'
 import { Action } from '@stacksjs/enums'
 import { handleError } from '@stacksjs/error-handling'
+import { storage } from '@stacksjs/storage'
 import { log, runCommand } from '@stacksjs/cli'
 import { ExitCode } from '@stacksjs/types'
 import type { CLI, CliOptions } from '@stacksjs/types'

package/src/commands/types.ts

@@ -1,7 +1,7 @@
 import process from 'node:process'
 import type { CLI, CliOptions } from '@stacksjs/types'
 import { generateTypes } from '@stacksjs/actions'
-import { log } from 'stacks/logging'
+import { log } from '@stacksjs/logging'
 
 export function types(buddy: CLI) {
   const descriptions = {