heroku 9.3.0 → 9.3.1-beta.0

package/lib/commands/local/run.js

@@ -4,13 +4,13 @@ const completions_1 = require("@heroku-cli/command/lib/completions");
 const core_1 = require("@oclif/core");
 const color_1 = require("@heroku-cli/color");
 const fork_foreman_1 = require("../../lib/local/fork-foreman");
+const helpers_1 = require("../../lib/run/helpers");
 const fs = require("fs");
 class Run extends core_1.Command {
     async run() {
         const execArgv = ['run'];
         const { argv, flags } = await this.parse(Run);
-        const maybeOptionsIndex = process.argv.indexOf('--');
-        const commandArgs = (maybeOptionsIndex === -1 ? argv : process.argv.slice(maybeOptionsIndex + 1));
+        const commandArgs = (0, helpers_1.revertSortedArgs)(process.argv, argv);
         if (commandArgs.length === 0) {
             const errorMessage = 'Usage: heroku local:run [COMMAND]\nMust specify command to run';
             this.error(errorMessage, { exit: -1 });

package/lib/commands/run/index.js

@@ -10,14 +10,13 @@ const debug = (0, debug_1.default)('heroku:run');
 class Run extends command_1.Command {
     async run() {
         const { argv, flags } = await this.parse(Run);
-        const maybeOptionsIndex = process.argv.indexOf('--');
-        const command = (0, helpers_1.buildCommand)((maybeOptionsIndex === -1 ? argv : process.argv.slice(maybeOptionsIndex + 1)));
+        const command = (0, helpers_1.revertSortedArgs)(process.argv, argv);
         const opts = {
             'exit-code': flags['exit-code'],
             'no-tty': flags['no-tty'],
             app: flags.app,
             attach: true,
-            command,
+            command: (0, helpers_1.buildCommand)(command),
             env: flags.env,
             heroku: this.heroku,
             listen: flags.listen,

package/lib/lib/run/helpers.d.ts

@@ -1,2 +1,3 @@
+export declare function revertSortedArgs(processArgs: Array<string>, argv: Array<string>): string[];
 export declare function buildCommand(args: Array<string>): string;
 export declare function buildEnvFromFlag(flag: string): {};

package/lib/lib/run/helpers.js

@@ -1,8 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildEnvFromFlag = exports.buildCommand = void 0;
+exports.buildEnvFromFlag = exports.buildCommand = exports.revertSortedArgs = void 0;
 /* eslint-disable @typescript-eslint/ban-ts-comment */
 const core_1 = require("@oclif/core");
+// this function exists because oclif sorts argv
+// and to capture all non-flag command inputs
+function revertSortedArgs(processArgs, argv) {
+    const originalInputOrder = [];
+    const flagRegex = /^--?/;
+    let isSeparatorPresent = false;
+    let argIsFlag = false;
+    // this for-loop performs 2 tasks
+    // 1. reorders the arguments in the order the user inputted
+    // 2. checks that no oclif flags are included in originalInputOrder
+    for (const processArg of processArgs) {
+        argIsFlag = flagRegex.test(processArg);
+        if (processArg === '--') {
+            isSeparatorPresent = true;
+        }
+        if ((argv.includes(processArg) && (!isSeparatorPresent && !argIsFlag)) ||
+            (argv.includes(processArg) && (isSeparatorPresent))) {
+            originalInputOrder.push(processArg);
+        }
+    }
+    return originalInputOrder;
+}
+exports.revertSortedArgs = revertSortedArgs;
 function buildCommand(args) {
     if (args.length === 1) {
         // do not add quotes around arguments if there is only one argument