fix multiple flags bug

.github/workflows/combine-prs.yaml

@@ -33,7 +33,7 @@ jobs:
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-      - uses: actions/github-script@v6
+      - uses: actions/github-script@v7
         id: create-combined-pr
         name: Create Combined PR
         with:

packages/cli-common/package.json

@@ -8,7 +8,7 @@
   ],
   "license": "Apache-2.0",
   "dependencies": {
-    "@oclif/core": "^2",
+    "@oclif/core": "^3",
     "@preevy/core": "0.0.56",
     "chalk": "^4.1.2",
     "iter-tools-es": "^7.5.3",

packages/cli-common/src/lib/common-flags.ts

@@ -12,6 +12,7 @@ export const composeFlags = {
   file: Flags.string({
     description: 'Compose configuration file',
     multiple: true,
+    singleValue: true,
     required: false,
     char: 'f',
     default: [],
@@ -20,6 +21,7 @@ export const composeFlags = {
   'system-compose-file': Flags.string({
     description: 'Add extra Compose configuration file without overriding the defaults',
     multiple: true,
+    singleValue: true,
     required: false,
     default: [],
     helpGroup: 'GLOBAL',

packages/cli/package.json

@@ -19,7 +19,7 @@
   ],
   "dependencies": {
     "@inquirer/confirm": "^2.0.14",
-    "@oclif/core": "^2",
+    "@oclif/core": "^3",
     "@oclif/plugin-help": "^5",
     "@preevy/cli-common": "0.0.56",
     "@preevy/common": "0.0.56",
@@ -38,7 +38,6 @@
     "yaml": "^2.3.2"
   },
   "devDependencies": {
-    "@oclif/test": "^2.3.4",
     "@types/inquirer": "^8.0.0",
     "@types/inquirer-autocomplete-prompt": "^3.0.3",
     "@types/lodash": "^4.14.192",
@@ -55,7 +54,7 @@
     "eslint-plugin-jsx-a11y": "^6.7.1",
     "eslint-plugin-react": "^7.32.2",
     "jest": "29.7.0",
-    "oclif": "^3",
+    "oclif": "^4.0.4",
     "pkg": "^5.8.1",
     "shx": "^0.3.3",
     "ts-node": "^10.9.1",

packages/cli/src/commands/profile/config/update.ts

@@ -53,6 +53,7 @@ export default class UpdateProfileConfig extends ProfileCommand<typeof UpdatePro
       description: 'Unset a configuration option',
       default: [],
       multiple: true,
+      singleValue: true,
     }),
   }
 

packages/cli/src/commands/purge.ts

@@ -47,6 +47,7 @@ export default class Purge extends DriverCommand<typeof Purge> {
       description: 'Resource type(s) to delete',
       default: [machineResourceType],
       multiple: true,
+      singleValue: true,
     }),
     force: Flags.boolean({
       description: 'Do not ask for confirmation',

packages/cli/src/help.ts

@@ -1,10 +1,10 @@
-import { CommandHelp as BaseCommandHelp, Help as OclifHelp } from '@oclif/core'
+import { CommandHelp as BaseCommandHelp, Command, Help as OclifHelp } from '@oclif/core'
 import { HelpOptions, Config, Topic } from '@oclif/core/lib/interfaces'
 import { BaseCommand, text } from '@preevy/cli-common'
 
 class GlobalFlagsHelp extends BaseCommandHelp {
-  constructor(config: Config, opts: HelpOptions) {
-    super(BaseCommand, config, opts)
+  constructor(command: Command.Loadable, config: Config, opts: HelpOptions) {
+    super(command, config, opts)
   }
 
   globalFlags() {
@@ -13,20 +13,9 @@ class GlobalFlagsHelp extends BaseCommandHelp {
   }
 }
 
-class CommandHelp extends BaseCommandHelp {
-  constructor(...args: ConstructorParameters<typeof BaseCommandHelp>) {
-    super(...args)
-  }
-}
-
 export default class Help extends OclifHelp {
-  constructor(...args: ConstructorParameters<typeof OclifHelp>) {
-    super(...args)
-    this.CommandHelpClass = CommandHelp
-  }
-
   protected formatGlobalFlags(): string {
-    return this.section('GLOBAL FLAGS', new GlobalFlagsHelp(this.config, this.opts).globalFlags())
+    return this.section('GLOBAL FLAGS', new GlobalFlagsHelp(this.config.commands[0], this.config, this.opts).globalFlags())
   }
 
   override async showRootHelp(): Promise<void> {

packages/driver-azure/package.json

@@ -17,7 +17,7 @@
     "@azure/arm-subscriptions": "^5.1.0",
     "@azure/identity": "^3.2.2",
     "@azure/logger": "^1.0.4",
-    "@oclif/core": "^2",
+    "@oclif/core": "^3",
     "@preevy/core": "0.0.56",
     "inquirer": "^8.0.0",
     "inquirer-autocomplete-prompt": "^2.0.0",

packages/driver-gce/package.json

@@ -12,7 +12,7 @@
   "dependencies": {
     "@google-cloud/compute": "^4.0.1",
     "@google-cloud/storage": "^6.9.5",
-    "@oclif/core": "^2",
+    "@oclif/core": "^3",
     "@preevy/core": "0.0.56",
     "google-auth-library": "^8.7.0",
     "google-gax": "^4.0.4",

packages/driver-kube-pod/package.json

@@ -11,7 +11,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@kubernetes/client-node": "^0.18.1",
-    "@oclif/core": "^2",
+    "@oclif/core": "^3",
     "@preevy/common": "0.0.56",
     "@preevy/core": "0.0.56",
     "fast-safe-stringify": "^2.1.1",

packages/driver-lightsail/package.json

@@ -14,7 +14,7 @@
     "@aws-sdk/client-s3": "^3.271.0",
     "@aws-sdk/client-sts": "^3.289.0",
     "@aws-sdk/util-waiter": "^3.271.0",
-    "@oclif/core": "^2",
+    "@oclif/core": "^3",
     "@preevy/core": "0.0.56",
     "inquirer": "^8.0.0",
     "inquirer-autocomplete-prompt": "^2.0.0",

packages/plugin-github-pr-link/package.json

@@ -8,7 +8,7 @@
   ],
   "license": "Apache-2.0",
   "dependencies": {
-    "@oclif/core": "^2",
+    "@oclif/core": "^3",
     "@preevy/cli-common": "0.0.56",
     "@preevy/core": "0.0.56",
     "lodash": "^4.17.21",

packages/plugin-github-pr-link/src/commands/github-pr/link.ts

@@ -19,7 +19,7 @@ class LinkGithubPr extends BaseGithubPrCommand<typeof LinkGithubPr> {
     const urls = await this.config.runCommand('urls', [
       ...(this.flags.id === undefined ? [] : [`--id ${this.flags.id}`]),
       ...(this.flags.debug === undefined ? [] : ['--debug']),
-      ...(this.flags.file.map(f => `--file ${f}`)),
+      ...Array.isArray(this.flags.file) ? (this.flags.file.map(f => `--file ${f}`)) : [],
       ...(this.flags.project === undefined ? [] : [`--project ${this.flags.project}`]),
       '--json',
     ]) as FlatTunnel[]

patches/@oclif+core+3.12.0.patch

@@ -0,0 +1,25 @@
+diff --git a/node_modules/@oclif/core/lib/interfaces/parser.d.ts b/node_modules/@oclif/core/lib/interfaces/parser.d.ts
+index acb8583..2d53745 100644
+--- a/node_modules/@oclif/core/lib/interfaces/parser.d.ts
++++ b/node_modules/@oclif/core/lib/interfaces/parser.d.ts
+@@ -200,6 +200,7 @@ export type OptionFlagProps = FlagProps & {
+     helpValue?: string;
+     options?: readonly string[];
+     multiple?: boolean;
++    singleValue?: boolean;
+     /**
+      * Delimiter to separate the values for a multiple value flag.
+      * Only respected if multiple is set to true. Default behavior is to
+diff --git a/node_modules/@oclif/core/lib/parser/parse.js b/node_modules/@oclif/core/lib/parser/parse.js
+index 032063d..72d2ed5 100644
+--- a/node_modules/@oclif/core/lib/parser/parse.js
++++ b/node_modules/@oclif/core/lib/parser/parse.js
+@@ -145,7 +145,7 @@ class Parser {
+                     continue;
+                 }
+             }
+-            if (parsingFlags && this.currentFlag && this.currentFlag.multiple) {
++            if (parsingFlags && this.currentFlag && this.currentFlag.multiple && !this.currentFlag.singleValue) {
+                 this.raw.push({ flag: this.currentFlag.name, input, type: 'flag' });
+                 continue;
+             }