Merge pull request #509 from salesforcecli/sm/ensureArray

refactor: ensureArray from kit

Author: shetzel

package.json

@@ -12,7 +12,7 @@
     "@octokit/core": "^4.0.4",
     "@salesforce/command": "^5.2.3",
     "@salesforce/core": "^3.26.0",
-    "@salesforce/kit": "^1.5.22",
+    "@salesforce/kit": "^1.6.0",
     "@salesforce/plugin-trust": "^2.0.3",
     "@salesforce/ts-types": "^1.5.20",
     "agent-base": "^6.0.2",
@@ -34,7 +34,6 @@
     "yarn-deduplicate": "^3.1.0"
   },
   "devDependencies": {
-    "oclif": "^3.1.2",
     "@oclif/plugin-command-snapshot": "^3",
     "@salesforce/dev-config": "^3.0.0",
     "@salesforce/dev-scripts": "^2.0.3",
@@ -62,6 +61,7 @@
     "husky": "^7.0.4",
     "mocha": "^9.1.3",
     "nyc": "^15.1.0",
+    "oclif": "^3.1.2",
     "prettier": "^2.4.1",
     "pretty-quick": "^3.1.0",
     "shx": "0.3.4",

src/commands/cli/versions/inspect.ts

@@ -15,7 +15,7 @@ import { flags, FlagsConfig, SfdxCommand } from '@salesforce/command';
 import { Messages, SfError } from '@salesforce/core';
 import { green, red, cyan, yellow, bold } from 'chalk';
 import { ensure } from '@salesforce/ts-types';
-import { parseJson } from '@salesforce/kit';
+import { ensureArray, parseJson } from '@salesforce/kit';
 import { PackageJson } from '../../../package';
 import { CLI } from '../../../types';
 
@@ -135,10 +135,6 @@ const CLI_META = {
   },
 };
 
-function toArray(arrOrString: string | string[]): string[] {
-  return Array.isArray(arrOrString) ? arrOrString : [arrOrString];
-}
-
 export default class Inspect extends SfdxCommand {
   public static readonly description = messages.getMessage('description');
   public static readonly examples = messages.getMessage('examples').split(os.EOL);
@@ -179,8 +175,8 @@ export default class Inspect extends SfdxCommand {
   public archives: Archives;
 
   public async run(): Promise<Info[]> {
-    const locations = toArray(this.flags.locations) as Location[];
-    const channels = toArray(this.flags.channels) as Channel[];
+    const locations = ensureArray(this.flags.locations) as Location[];
+    const channels = ensureArray(this.flags.channels) as Channel[];
 
     if (this.flags.cli === CLI.SF && channels.includes(Channel.LEGACY)) {
       throw new SfError('the sf CLI does not have a legacy channel');

yarn.lock

@@ -1234,10 +1234,10 @@
     typedoc-plugin-missing-exports "0.23.0"
     typescript "^4.1.3"
 
-"@salesforce/kit@^1.5.22", "@salesforce/kit@^1.5.34", "@salesforce/kit@^1.5.41":
-  version "1.5.45"
-  resolved "https://registry.yarnpkg.com/@salesforce/kit/-/kit-1.5.45.tgz#200a85f75681f4567820cf206a04b3d44e43e0b0"
-  integrity sha512-e7iER8s/f8N52rSRZ7uJXSKnOTDTH9NHfGnmkFXPuz/1Waaeqso+CxqmqCh8aVe//frj11NGkazR0rJPuF/bfA==
+"@salesforce/kit@^1.5.34", "@salesforce/kit@^1.5.41", "@salesforce/kit@^1.6.0":
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/@salesforce/kit/-/kit-1.6.0.tgz#0305dea2c9847d4b08068c4a9d436da5c9a5ce5e"
+  integrity sha512-8VZvWYl61jBaUIqo+pNoDvVqaZKPmqauvkhJHvcr/+D7+EXsjne9PDMggy5mNQJvonD6iegR/h3BqcWrppSaeQ==
   dependencies:
     "@salesforce/ts-types" "^1.5.20"
     shx "^0.3.3"