heroku 10.0.3-alpha.3 → 10.0.3-beta.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "heroku",
   "description": "CLI to interact with Heroku",
-  "version": "10.0.3-alpha.3",
+  "version": "10.0.3-beta.0",
   "author": "Heroku",
   "bin": "./bin/run",
   "bugs": "https://github.com/heroku/cli/issues",
@@ -46,7 +46,7 @@
     "execa": "5.1.1",
     "filesize": "^10.1.2",
     "foreman": "^3.0.1",
-    "fs-extra": "^9.1",
+    "fs-extra": "^11.3.0",
     "github-url-to-object": "^4.0.4",
     "glob": "^10.3.10",
     "got": "^11.8.6",
@@ -78,8 +78,7 @@
     "urijs": "^1.19.11",
     "validator": "^13.7.0",
     "word-wrap": "^1.2.5",
-    "ws": "^6.2.2",
-    "yargs-parser": "18.1.3"
+    "ws": "^6.2.2"
   },
   "devDependencies": {
     "@heroku-cli/schema": "^1.0.25",
@@ -89,7 +88,7 @@
     "@types/chai": "^4.3.14",
     "@types/chai-as-promised": "^7.1.8",
     "@types/debug": "^4.1.2",
-    "@types/fs-extra": "^7.0.0",
+    "@types/fs-extra": "^11.0.4",
     "@types/glob": "^7.1.1",
     "@types/inquirer": "^8.2.10",
     "@types/lodash": "^4.14.123",
@@ -102,6 +101,7 @@
     "@types/redis-parser": "^3.0.3",
     "@types/shell-escape": "^0.2.0",
     "@types/shell-quote": "^1.7.5",
+    "@types/sinon": "^17.0.3",
     "@types/ssh2": "^1.15.0",
     "@types/std-mocks": "^1.0.4",
     "@types/strftime": "^0.9.8",
@@ -126,7 +126,7 @@
     "qqjs": "0.3.11",
     "read-pkg": "^4.0.1",
     "rimraf": "5.0.5",
-    "sinon": "^7.2.4",
+    "sinon": "^19.0.2",
     "std-mocks": "^2.0.0",
     "strip-ansi": "6.0.1",
     "tmp": "^0.2.3",
@@ -391,5 +391,5 @@
     "version": "oclif readme --multi && git add README.md ../../docs"
   },
   "types": "lib/index.d.ts",
-  "gitHead": "ca78edeb011baec69aa41adac799c1de35264dfb"
+  "gitHead": "a9b1f3fa165a6a37e0681031eabfb1589dbf4e2e"
 }

package/bin/heroku-prompts.js

@@ -1,235 +0,0 @@
-const fs = require('node:fs')
-const inquirer = require('inquirer')
-
-function choicesPrompt(description, choices, required, defaultValue) {
-  return inquirer.prompt([{
-    type: 'list',
-    name: 'choices',
-    message: description,
-    choices,
-    default: defaultValue,
-    validate(input) {
-      if (!required || input) {
-        return true
-      }
-
-      return `${description} is required`
-    },
-  }])
-}
-
-function prompt(description, required) {
-  return inquirer.prompt([{
-    type: 'input',
-    name: 'input',
-    message: description,
-    validate(input) {
-      if (!required || input.trim()) {
-        return true
-      }
-
-      return `${description} is required`
-    },
-  }])
-}
-
-function filePrompt(description, defaultPath) {
-  return inquirer.prompt([{
-    type: 'input',
-    name: 'path',
-    message: description,
-    default: defaultPath,
-    validate(input) {
-      if (fs.existsSync(input)) {
-        return true
-      }
-
-      return 'File does not exist. Please enter a valid file path.'
-    },
-  }])
-}
-
-const showBooleanPrompt = async (commandFlag, userInputMap, defaultOption) => {
-  const {description, default: defaultValue, name: flagOrArgName} = commandFlag
-  const choice = await choicesPrompt(description, [
-    {name: 'yes', value: true},
-    {name: 'no', value: false},
-  ], defaultOption)
-
-  // user cancelled
-  if (choice === undefined || choice === 'Cancel') {
-    return true
-  }
-
-  if (choice === 'Yes') {
-    userInputMap.set(flagOrArgName, defaultValue)
-  }
-
-  return false
-}
-
-const showOtherDialog = async (commandFlagOrArg, userInputMap) => {
-  const {description, default: defaultValue, options, required, name: flagOrArgName} = commandFlagOrArg
-
-  let input
-  const isFileInput = description?.includes('absolute path')
-  if (isFileInput) {
-    input = await filePrompt(description, '')
-  } else if (options) {
-    const choices = options.map(option => ({name: option, value: option}))
-    input = await choicesPrompt(`Select the ${description}`, choices, required, defaultValue)
-  } else {
-    input = await prompt(`${description.slice(0, 1).toUpperCase()}${description.slice(1)} (${required ? 'required' : 'optional - press "Enter" to bypass'})`, required)
-  }
-
-  if (input === undefined) {
-    return true
-  }
-
-  if (input !== '') {
-    userInputMap.set(flagOrArgName, input)
-  }
-
-  return false
-}
-
-function collectInputsFromManifest(flagsOrArgsManifest, omitOptional) {
-  const requiredInputs = []
-  const optionalInputs = []
-
-  // Prioritize options over booleans to
-  // prevent the user from yo-yo back and
-  // forth between the different input dialogs
-  const keysByType = Object.keys(flagsOrArgsManifest).sort((a, b) => {
-    const {type: aType} = flagsOrArgsManifest[a]
-    const {type: bType} = flagsOrArgsManifest[b]
-    if (aType === bType) {
-      return 0
-    }
-
-    if (aType === 'option') {
-      return -1
-    }
-
-    if (bType === 'option') {
-      return 1
-    }
-
-    return 0
-  })
-
-  keysByType.forEach(key => {
-    const isRequired = Reflect.get(flagsOrArgsManifest[key], 'required');
-    (isRequired ? requiredInputs : optionalInputs).push(key)
-  })
-  // Prioritize required inputs
-  // over optional inputs when
-  // prompting the user.
-  // required inputs are sorted
-  // alphabetically. optional
-  // inputs are sorted alphabetically
-  // and then pushed to the end of
-  // the list.
-  requiredInputs.sort((a, b) => {
-    if (a < b) {
-      return -1
-    }
-
-    if (a > b) {
-      return 1
-    }
-
-    return 0
-  })
-  // Include optional only when not explicitly omitted
-  return omitOptional ? requiredInputs : [...requiredInputs, ...optionalInputs]
-}
-
-async function getInput(flagsOrArgsManifest, userInputMap, omitOptional) {
-  const flagsOrArgs = collectInputsFromManifest(flagsOrArgsManifest, omitOptional)
-
-  for (const flagOrArg of flagsOrArgs) {
-    const {name, description, type, hidden} = flagsOrArgsManifest[flagOrArg]
-    if (userInputMap.has(name)) {
-      continue
-    }
-
-    // hidden args and flags may be exposed later
-    // based on the user type. For now, skip them.
-    if (!description || hidden) {
-      continue
-    }
-
-    const cancelled = await (type === 'boolean' ? showBooleanPrompt : showOtherDialog)(flagsOrArgsManifest[flagOrArg], userInputMap)
-    if (cancelled) {
-      return true
-    }
-  }
-
-  return false
-}
-
-async function promptForInputs(commandName, commandManifest, userArgs, userFlags) {
-  const {args, flags} = commandManifest
-
-  const userInputByArg = new Map()
-  Object.keys(args).forEach((argKey, index) => {
-    if (userArgs[index]) {
-      userInputByArg.set(argKey, userArgs[index])
-    }
-  })
-
-  let cancelled = await getInput(args, userInputByArg)
-  if (cancelled) {
-    return {userInputByArg}
-  }
-
-  const userInputByFlag = new Map()
-  Object.keys(flags).forEach(flagKey => {
-    const {name, char} = flags[flagKey]
-    if (userFlags[name] || userFlags[char]) {
-      userInputByFlag.set(flagKey, userFlags[flagKey])
-    }
-  })
-  cancelled = await getInput(flags, userInputByFlag)
-  if (cancelled) {
-    return
-  }
-
-  return {userInputByArg, userInputByFlag}
-}
-
-module.exports.promptUser =  async (config, commandName, args, flags) => {
-  const commandMeta = config.findCommand(commandName)
-  if (!commandMeta) {
-    process.stderr.write(`"${commandName}" not a valid command\n$ `)
-    return
-  }
-
-  const {userInputByArg, userInputByFlag} = await promptForInputs(commandName, commandMeta, args, flags)
-
-  try {
-    for (const [, {input: argValue}] of userInputByArg) {
-      if (argValue) {
-        args.push(argValue)
-      }
-    }
-
-    for (const [flagName, {input: flagValue}] of userInputByFlag) {
-      if (!flagValue) {
-        continue
-      }
-
-      if (flagValue === true) {
-        args.push(`--${flagName}`)
-        continue
-      }
-
-      args.push(`--${flagName}`, flagValue)
-    }
-
-    return args
-  } catch (error) {
-    process.stderr.write(error.message)
-  }
-}

package/bin/heroku-repl.js

@@ -1,48 +0,0 @@
-const {Config} = require('@oclif/core')
-const root = require.resolve('../package.json')
-const config = new Config({root})
-const flagsByName = new Map()
-async function * commandGenerator() {
-  while (true) {
-    const argv = await new Promise(resolve => {
-      process.stdin.once('data', resolve)
-    })
-    yield argv.toString().trim().split(' ')
-  }
-}
-
-module.exports.herokuRepl = async function (config) {
-  process.stderr.write('Welcome to the Heroku Terminal!\n$ ')
-
-  for await (const input of commandGenerator()) {
-    const [command, ...argv] = input
-    if (command === '.exit') {
-      process.exit(0)
-    }
-
-    if (command.startsWith('set')) {
-      flagsByName.set(argv[0], argv[1])
-      process.stderr.write(`setting --app to "${argv[1]}"\n$ `)
-      continue
-    }
-
-    const commandMeta = config.findCommand(command)
-    if (!commandMeta) {
-      process.stderr.write(`"${command}" not a valid command\n$ `)
-      continue
-    }
-
-    try {
-      const {flags} = commandMeta
-      if (flags.app && flagsByName.has('app') && !argv?.includes('--app')) {
-        argv.push('--app', flagsByName.get('app'))
-      }
-
-      await config.runCommand(command, argv)
-    } catch (error) {
-      process.stderr.write(error.message)
-    }
-
-    process.stderr.write('\n$ ')
-  }
-}