@salesforce/cli 2.45.6 → 2.46.1

package/bin/dev.js

@@ -1,9 +1,11 @@
 #!/usr/bin/env ts-node
 
 async function main() {
-  const oclif = await import('@oclif/core');
-  oclif.settings.performanceEnabled = true;
-  await oclif.execute({ development: true, dir: import.meta.url });
+  const { settings } = await import('@oclif/core/settings');
+  const { execute } = await import('@oclif/core/execute');
+
+  settings.performanceEnabled = true;
+  await execute({ development: true, dir: import.meta.url });
 }
 
 await main();

package/bin/run.js

@@ -3,30 +3,13 @@
 // Pre-process/prune flags before creating or running the actual CLI
 (await import('../dist/flags.js')).preprocessCliFlags(process);
 
-const oclif = await import('@oclif/core');
-const { createRequire } = await import('module');
-const pjson = createRequire(import.meta.url)('../package.json');
+// Since the CLI is a single process, we can have a larger amount of max listeners since
+// the process gets shut down. Don't set it to 0 (no limit) since we should still be aware
+// of rogue event listeners
+process.setMaxListeners(parseInt(process.env.SF_MAX_EVENT_LISTENERS, 10) || 1000);
 
-const cli = await import('../dist/cli.js');
-
-async function main() {
-  // Since the CLI is a single process, we can have a larger amount of max listeners since
-  // the process gets shut down. Don't set it to 0 (no limit) since we should still be aware
-  // of rouge event listeners
-  process.setMaxListeners(parseInt(process.env.SF_MAX_EVENT_LISTENERS, 10) || 1000);
-
-  // Don't let other plugins override the CLI specified max listener count
-  process.setMaxListeners = () => {};
+// Don't let other plugins override the CLI specified max listener count
+process.setMaxListeners = () => {};
 
-  cli
-    .create({ version: pjson.version, bin: pjson.oclif.bin, channel: 'stable' })
-    .run()
-    .then(async () => {
-      await oclif.flush();
-    })
-    .catch(async (err) => {
-      await oclif.handle(err);
-    });
-}
-
-await main();
+const cli = await import('../dist/cli.js');
+await cli.run();

package/dist/cli.js

@@ -7,11 +7,10 @@
 import { platform, arch, release } from 'node:os';
 import { resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
-import { Config, run as oclifRun, settings } from '@oclif/core';
-import { set } from '@salesforce/kit';
-import Debug from 'debug';
-import { default as nodeEnv, Env } from './util/env.js';
-const debug = Debug('sf');
+import { execute } from '@oclif/core/execute';
+import { Config } from '@oclif/core/config';
+import NodeEnv, { Env } from './util/env.js';
+import { sfStartupLogger, logger } from './logger.js';
 const envVars = [
     ...new Set([
         ...Object.keys(process.env).filter((e) => e.startsWith('SF_') || e.startsWith('SFDX_')),
@@ -32,13 +31,6 @@ export const UPDATE_DISABLED_INSTALLER = 'Manual and automatic CLI updates have
 export const UPDATE_DISABLED_NPM = 'Use "npm update --global @salesforce/cli" to update npm-based installations.';
 export const UPDATE_DISABLED_DEMO = 'Manual and automatic CLI updates have been disabled in DEMO mode. ' +
     'To check for a new version, unset the environment variable SF_ENV.';
-export function configureUpdateSites(config, env = nodeEnv) {
-    const npmRegistry = env.getNpmRegistryOverride();
-    if (npmRegistry) {
-        // Override config value if set via envar
-        set(config, 'pjson.oclif.warn-if-update-available.registry', npmRegistry);
-    }
-}
 export function configureAutoUpdate(envars) {
     if (envars.isDemoMode()) {
         // Disable autoupdates in demo mode
@@ -62,11 +54,12 @@ export function configureAutoUpdate(envars) {
         envars.setUpdateInstructions(UPDATE_DISABLED_NPM);
     }
 }
-function debugCliInfo(version, channel, env, config) {
+function debugCliInfo(env, config) {
     function debugSection(section, items) {
         const pad = 25;
-        debug('%s:', section.padStart(pad));
-        items.forEach(([name, value]) => debug('%s: %s', name.padStart(pad), value));
+        const header = `### ${section} ###`;
+        sfStartupLogger.debug('%s', header.padStart(pad));
+        items.forEach(([name, value]) => sfStartupLogger.debug('%s: %s', name.padStart(pad), value));
     }
     debugSection('OS', [
         ['platform', platform()],
@@ -76,8 +69,8 @@ function debugCliInfo(version, channel, env, config) {
     ]);
     debugSection('NODE', [['version', process.versions.node]]);
     debugSection('CLI', [
-        ['version', version],
-        ['channel', channel],
+        ['version', config.version],
+        ['channel', config.channel],
         ['bin', config.bin],
         ['data', config.dataDir],
         ['cache', config.cacheDir],
@@ -86,26 +79,16 @@ function debugCliInfo(version, channel, env, config) {
     debugSection('ENV', [...envVars].map((key) => [key, env.getString(key, '<not set>')]));
     debugSection('ARGS', process.argv.map((arg, i) => [i.toString(), arg]));
 }
-export function create({ version, bin, channel, run, env }) {
-    settings.performanceEnabled = true;
-    const root = resolve(fileURLToPath(import.meta.url), '..');
-    const args = process.argv.slice(2);
-    const environment = env ?? nodeEnv;
-    return {
-        async run() {
-            const config = new Config({
-                name: bin,
-                root,
-                version,
-                channel,
-            });
-            await config.load();
-            configureUpdateSites(config, environment);
-            configureAutoUpdate(environment);
-            debugCliInfo(version, channel, environment, config);
-            // Example of how run is used in a test https://github.com/salesforcecli/cli/pull/171/files#diff-1deee0a575599b2df117c280da319f7938aaf6fdb0c04bcdbde769dbf464be69R46
-            return run ? run(args, config) : oclifRun(args, config);
-        },
-    };
+export async function run() {
+    configureAutoUpdate(NodeEnv);
+    const config = await Config.load({
+        root: resolve(fileURLToPath(import.meta.url), '..'),
+        logger,
+        enablePerf: true,
+    });
+    debugCliInfo(NodeEnv, config);
+    return execute({
+        loadOptions: config,
+    });
 }
 //# sourceMappingURL=cli.js.map

package/dist/help/sfCommandHelp.js

@@ -4,7 +4,7 @@
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-import { CommandHelp } from '@oclif/core';
+import { CommandHelp } from '@oclif/core/help';
 export class SfCommandHelp extends CommandHelp {
     constructor(command, config, opts) {
         super(command, config, opts);

package/dist/help/sfHelp.js

@@ -4,10 +4,11 @@
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-import { Help, toConfiguredId } from '@oclif/core';
-import stripAnsi from 'strip-ansi';
-import chalk from 'chalk';
+import { Help } from '@oclif/core/help';
+import { toConfiguredId } from '@oclif/core/util/ids';
+import { Ansis } from 'ansis';
 import { SfCommandHelp } from './sfCommandHelp.js';
+const ansis = new Ansis();
 export default class SfHelp extends Help {
     constructor(config, opts) {
         super(config, opts);
@@ -54,9 +55,9 @@ export default class SfHelp extends Help {
     log(...args) {
         const formatted = args.map((arg) => {
             let formattedArg = arg.slice();
-            const matches = stripAnsi(formattedArg).match(this.commandIdRegex) ?? [];
+            const matches = ansis.strip(formattedArg).match(this.commandIdRegex) ?? [];
             for (const match of matches) {
-                formattedArg = formattedArg.replaceAll(match, chalk.dim(match));
+                formattedArg = formattedArg.replaceAll(match, ansis.dim(match));
             }
             return formattedArg;
         });

package/dist/hooks/display-release-notes.js

@@ -1,10 +1,4 @@
-/*
- * Copyright (c) 2021, salesforce.com, inc.
- * All rights reserved.
- * Licensed under the BSD 3-Clause license.
- * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
- */
-import { ux } from '@oclif/core';
+import ux from '@oclif/core/ux';
 export const hook = async function ({ config }) {
     if (process.env.SF_HIDE_RELEASE_NOTES === 'true')
         return;
@@ -13,9 +7,9 @@ export const hook = async function ({ config }) {
     }
     catch (err) {
         const error = err;
-        ux.log('NOTE: This error can be ignored in CI and may be silenced in the future');
-        ux.log('- Set the SF_HIDE_RELEASE_NOTES env var to "true" to skip this script\n');
-        ux.log(error.message);
+        ux.stdout('NOTE: This error can be ignored in CI and may be silenced in the future');
+        ux.stdout('- Set the SF_HIDE_RELEASE_NOTES env var to "true" to skip this script\n');
+        ux.stdout(error.message);
     }
 };
 export default hook;

package/dist/hooks/incomplete.js

@@ -4,8 +4,8 @@
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-import * as os from 'node:os';
-import { toConfiguredId, toStandardizedId, loadHelpClass } from '@oclif/core';
+import os from 'node:os';
+import { toConfiguredId, toStandardizedId } from '@oclif/core/util/ids';
 function buildChoices(matches, config) {
     const configuredIds = matches.map((p) => toConfiguredId(p.id, config));
     const maxCommandLength = configuredIds.reduce((max, id) => Math.max(max, id.length), 0);
@@ -38,6 +38,7 @@ async function determineCommand(config, matches) {
 const hook = async function ({ config, matches, argv }) {
     const command = await determineCommand(config, matches.filter((m) => !m.hidden));
     if (argv.includes('--help') || argv.includes('-h')) {
+        const { loadHelpClass } = await import('@oclif/core/help');
         const Help = await loadHelpClass(config);
         // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
         const help = new Help(config, config.pjson.helpOptions);

package/dist/hooks/pluginsPreinstall.js

@@ -4,12 +4,12 @@
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-import { Errors } from '@oclif/core';
 const hook = async function (options) {
     const verifySignHookResult = await this.config.runHook('plugins:preinstall:verify:signature', options);
     const pluginTrustFailure = verifySignHookResult.failures.find((failure) => failure.plugin.name === '@salesforce/plugin-trust');
     if (pluginTrustFailure !== undefined) {
-        await Errors.handle(pluginTrustFailure.error);
+        const { handle } = await import('@oclif/core/handle');
+        await handle(pluginTrustFailure.error);
     }
 };
 export default hook;

package/dist/hooks/prerun.js

@@ -4,7 +4,6 @@
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-import { ux } from '@oclif/core';
 // eslint-disable-next-line @typescript-eslint/require-await
 const hook = async function ({ Command, config }) {
     if (process.argv.includes('--json'))
@@ -20,6 +19,7 @@ const hook = async function ({ Command, config }) {
     if (!specifiedVersion)
         return;
     if (plugin.version !== specifiedVersion) {
+        const { ux } = await import('@oclif/core/ux');
         ux.warn(`Plugin ${plugin.name} (${plugin.version}) differs from the version specified by ${config.bin} (${specifiedVersion})`);
     }
 };

package/dist/logger.js

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2023, salesforce.com, inc.
+ * All rights reserved.
+ * Licensed under the BSD 3-Clause license.
+ * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ */
+import { format } from 'node:util';
+import { Logger } from '@salesforce/core/logger';
+const customLogger = (namespace) => {
+    const sfLogger = new Logger(namespace);
+    return {
+        child: (ns, delimiter) => customLogger(`${namespace}${delimiter ?? ':'}${ns}`),
+        debug: (formatter, ...args) => sfLogger.debug(format(formatter, ...args)),
+        error: (formatter, ...args) => sfLogger.error(format(formatter, ...args)),
+        info: (formatter, ...args) => sfLogger.info(format(formatter, ...args)),
+        trace: (formatter, ...args) => sfLogger.trace(format(formatter, ...args)),
+        warn: (formatter, ...args) => sfLogger.warn(format(formatter, ...args)),
+        namespace,
+    };
+};
+export const logger = customLogger('sf:oclif');
+export const sfStartupLogger = customLogger('sf-startup');
+//# sourceMappingURL=logger.js.map

package/dist/util/env.js

@@ -31,12 +31,6 @@ export class Env extends EnvVars {
     isInstaller() {
         return this.getBoolean(Env.SF_INSTALLER);
     }
-    getNpmRegistryOverride() {
-        return this.getString(Env.SF_NPM_REGISTRY);
-    }
-    setNpmRegistryOverride(value) {
-        return this.setString(Env.SF_NPM_REGISTRY, value);
-    }
     normalizeAutoupdateDisabled() {
         // Ensure that the legacy envar always causes the oclif counterpart to be set
         // see https://github.com/oclif/plugin-update/blob/3946fb296a0a95544ab6364b36a1f7422c8aeddf/src/hooks/init.ts#L22