@pnp/cli-microsoft365 7.3.0-beta.ca3f7f5 → 7.3.0-beta.d293309

package/dist/m365/aad/commands/user/user-license-remove.js

@@ -7,7 +7,7 @@ var _AadUserLicenseRemoveCommand_instances, _AadUserLicenseRemoveCommand_initTel
 import commands from '../../commands.js';
 import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 class AadUserLicenseRemoveCommand extends GraphCommand {
     get name() {
@@ -32,7 +32,7 @@ class AadUserLicenseRemoveCommand extends GraphCommand {
             await this.deleteUserLicenses(args);
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the licenses for the user '${args.options.userId || args.options.userName}'?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the licenses for the user '${args.options.userId || args.options.userName}'?` });
             if (result) {
                 await this.deleteUserLicenses(args);
             }

package/dist/m365/aad/commands/user/user-recyclebinitem-clear.js

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _AadUserRecycleBinItemClearCommand_instances, _AadUserRecycleBinItemClearCommand_initTelemetry, _AadUserRecycleBinItemClearCommand_initOptions;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
@@ -63,7 +63,7 @@ class AadUserRecycleBinItemClearCommand extends GraphCommand {
             await clearRecycleBinUsers();
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: 'Are you sure you want to permanently delete all deleted users?' });
+            const result = await cli.promptForConfirmation({ message: 'Are you sure you want to permanently delete all deleted users?' });
             if (result) {
                 await clearRecycleBinUsers();
             }

package/dist/m365/aad/commands/user/user-recyclebinitem-remove.js

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _AadUserRecycleBinItemRemoveCommand_instances, _AadUserRecycleBinItemRemoveCommand_initTelemetry, _AadUserRecycleBinItemRemoveCommand_initOptions, _AadUserRecycleBinItemRemoveCommand_initValidators;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
@@ -43,7 +43,7 @@ class AadUserRecycleBinItemRemoveCommand extends GraphCommand {
             await clearRecycleBinItem();
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to permanently delete the user with id ${args.options.id}?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to permanently delete the user with id ${args.options.id}?` });
             if (result) {
                 await clearRecycleBinItem();
             }

package/dist/m365/aad/commands/user/user-remove.js

@@ -7,7 +7,7 @@ var _AadUserRemoveCommand_instances, _AadUserRemoveCommand_initTelemetry, _AadUs
 import commands from '../../commands.js';
 import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 class AadUserRemoveCommand extends GraphCommand {
     get name() {
@@ -32,7 +32,7 @@ class AadUserRemoveCommand extends GraphCommand {
             await this.deleteUser(args);
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove user '${args.options.id || args.options.userName}'?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove user '${args.options.id || args.options.userName}'?` });
             if (result) {
                 await this.deleteUser(args);
             }

package/dist/m365/aad/commands.js

@@ -4,6 +4,7 @@ export default {
     ADMINISTRATIVEUNIT_GET: `${prefix} administrativeunit get`,
     ADMINISTRATIVEUNIT_LIST: `${prefix} administrativeunit list`,
     ADMINISTRATIVEUNIT_REMOVE: `${prefix} administrativeunit remove`,
+    ADMINISTRATIVEUNIT_MEMBER_LIST: `${prefix} administrativeunit member list`,
     APP_ADD: `${prefix} app add`,
     APP_GET: `${prefix} app get`,
     APP_LIST: `${prefix} app list`,

package/dist/m365/app/commands/app-get.js

@@ -1,4 +1,4 @@
-import { Cli } from '../../../cli/Cli.js';
+import { cli } from '../../../cli/cli.js';
 import aadAppGetCommand from '../../aad/commands/app/app-get.js';
 import AppCommand from '../../base/AppCommand.js';
 import commands from '../commands.js';
@@ -17,7 +17,7 @@ class AppGetCommand extends AppCommand {
             verbose: args.options.verbose
         };
         try {
-            const appGetOutput = await Cli.executeCommandWithOutput(aadAppGetCommand, { options: { ...options, _: [] } });
+            const appGetOutput = await cli.executeCommandWithOutput(aadAppGetCommand, { options: { ...options, _: [] } });
             if (this.verbose) {
                 await logger.logToStderr(appGetOutput.stderr);
             }

package/dist/m365/app/commands/app-open.js

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _AppOpenCommand_instances, _AppOpenCommand_initTelemetry, _AppOpenCommand_initOptions;
-import { Cli } from '../../../cli/Cli.js';
+import { cli } from '../../../cli/cli.js';
 import { settingsNames } from '../../../settingsNames.js';
 import { browserUtil } from '../../../utils/browserUtil.js';
 import AppCommand from '../../base/AppCommand.js';
@@ -33,7 +33,7 @@ class AppOpenCommand extends AppCommand {
     async logOrOpenUrl(args, logger) {
         const previewPrefix = args.options.preview === true ? "preview." : "";
         const url = `https://${previewPrefix}portal.azure.com/#blade/Microsoft_AAD_RegisteredApps/ApplicationMenuBlade/Overview/appId/${this.appId}/isMSAApp/`;
-        if (Cli.getInstance().getSettingWithDefaultValue(settingsNames.autoOpenLinksInBrowser, false) === false) {
+        if (cli.getSettingWithDefaultValue(settingsNames.autoOpenLinksInBrowser, false) === false) {
             await logger.log(`Use a web browser to open the page ${url}`);
             return;
         }

package/dist/m365/app/commands/permission/permission-list.js

@@ -1,4 +1,4 @@
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import appGetCommand from '../../../aad/commands/app/app-get.js';
 import AppCommand from '../../../base/AppCommand.js';
@@ -186,7 +186,7 @@ class AppPermissionListCommand extends AppCommand {
             debug: this.debug,
             verbose: this.verbose
         };
-        const output = await Cli.executeCommandWithOutput(appGetCommand, { options: { ...options, _: [] } });
+        const output = await cli.executeCommandWithOutput(appGetCommand, { options: { ...options, _: [] } });
         if (this.debug) {
             await logger.logToStderr(output.stderr);
         }

package/dist/m365/base/AppCommand.js

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _AppCommand_instances, _AppCommand_initOptions, _AppCommand_initValidators;
 import fs from 'fs';
-import { Cli } from '../../cli/Cli.js';
+import { cli } from '../../cli/cli.js';
 import Command, { CommandError } from '../../Command.js';
 import { validation } from '../../utils/validation.js';
 import { formatting } from '../../utils/formatting.js';
@@ -54,7 +54,7 @@ class AppCommand extends Command {
         }
         if (this.m365rcJson.apps.length > 1) {
             const resultAsKeyValuePair = formatting.convertArrayToHashTable('appIdIndex', this.m365rcJson.apps);
-            const result = await Cli.handleMultipleResultsFound(`Multiple Azure AD apps found in ${m365rcJsonPath}.`, resultAsKeyValuePair);
+            const result = await cli.handleMultipleResultsFound(`Multiple Azure AD apps found in ${m365rcJsonPath}.`, resultAsKeyValuePair);
             this.appId = this.m365rcJson.apps[result.appIdIndex].appId;
             await super.action(logger, args);
         }

package/dist/m365/booking/commands/business/business-get.js

@@ -8,7 +8,7 @@ import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 class BookingBusinessGetCommand extends GraphCommand {
     get name() {
         return commands.BUSINESS_GET;
@@ -62,7 +62,7 @@ class BookingBusinessGetCommand extends GraphCommand {
         }
         if (bookingBusinesses.length > 1) {
             const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', bookingBusinesses);
-            const result = await Cli.handleMultipleResultsFound(`Multiple businesses with name '${options.name}' found.`, resultAsKeyValuePair);
+            const result = await cli.handleMultipleResultsFound(`Multiple businesses with name '${options.name}' found.`, resultAsKeyValuePair);
             return result.id;
         }
         return bookingBusinesses[0].id;

package/dist/m365/cli/commands/cli-doctor.js

@@ -1,6 +1,6 @@
 import os from 'os';
 import auth, { AuthType } from '../../../Auth.js';
-import { Cli } from '../../../cli/Cli.js';
+import { cli } from '../../../cli/cli.js';
 import Command from '../../../Command.js';
 import { app } from '../../../utils/app.js';
 import { validation } from '../../../utils/validation.js';
@@ -35,7 +35,7 @@ class CliDoctorCommand extends Command {
             cliAadAppTenant: validation.isValidGuid(auth.service.tenant) ? 'single' : auth.service.tenant,
             authMode: AuthType[auth.service.authType],
             cliEnvironment: process.env.CLIMICROSOFT365_ENV ? process.env.CLIMICROSOFT365_ENV : '',
-            cliConfig: Cli.getInstance().config.all,
+            cliConfig: cli.getConfig().all,
             roles: roles,
             scopes: Object.fromEntries(scopes)
         };

package/dist/m365/cli/commands/cli-reconsent.js

@@ -1,4 +1,4 @@
-import { Cli } from '../../../cli/Cli.js';
+import { cli } from '../../../cli/cli.js';
 import config from '../../../config.js';
 import { settingsNames } from '../../../settingsNames.js';
 import { browserUtil } from '../../../utils/browserUtil.js';
@@ -13,7 +13,7 @@ class CliReconsentCommand extends AnonymousCommand {
     }
     async commandAction(logger) {
         const url = `https://login.microsoftonline.com/${config.tenant}/oauth2/authorize?client_id=${config.cliAadAppId}&response_type=code&prompt=admin_consent`;
-        if (Cli.getInstance().getSettingWithDefaultValue(settingsNames.autoOpenLinksInBrowser, false) === false) {
+        if (cli.getSettingWithDefaultValue(settingsNames.autoOpenLinksInBrowser, false) === false) {
             await logger.log(`To re-consent the PnP Microsoft 365 Management Shell Azure AD application navigate in your web browser to ${url}`);
             return;
         }

package/dist/m365/cli/commands/config/config-get.js

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _CliConfigGetCommand_instances, _a, _CliConfigGetCommand_initTelemetry, _CliConfigGetCommand_initOptions, _CliConfigGetCommand_initValidators;
-import { Cli } from "../../../../cli/Cli.js";
+import { cli } from "../../../../cli/cli.js";
 import { settingsNames } from "../../../../settingsNames.js";
 import AnonymousCommand from "../../../base/AnonymousCommand.js";
 import commands from "../../commands.js";
@@ -23,7 +23,7 @@ class CliConfigGetCommand extends AnonymousCommand {
         __classPrivateFieldGet(this, _CliConfigGetCommand_instances, "m", _CliConfigGetCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
-        await logger.log(Cli.getInstance().config.get(args.options.key));
+        await logger.log(cli.getConfig().get(args.options.key));
     }
 }
 _a = CliConfigGetCommand, _CliConfigGetCommand_instances = new WeakSet(), _CliConfigGetCommand_initTelemetry = function _CliConfigGetCommand_initTelemetry() {

package/dist/m365/cli/commands/config/config-list.js

@@ -1,4 +1,4 @@
-import { Cli } from "../../../../cli/Cli.js";
+import { cli } from "../../../../cli/cli.js";
 import AnonymousCommand from "../../../base/AnonymousCommand.js";
 import commands from "../../commands.js";
 class CliConfigListCommand extends AnonymousCommand {
@@ -9,7 +9,7 @@ class CliConfigListCommand extends AnonymousCommand {
         return 'List all self set CLI for Microsoft 365 configurations';
     }
     async commandAction(logger) {
-        await logger.log(Cli.getInstance().config.all);
+        await logger.log(cli.getConfig().all);
     }
 }
 export default new CliConfigListCommand();

package/dist/m365/cli/commands/config/config-reset.js

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _CliConfigResetCommand_instances, _a, _CliConfigResetCommand_initTelemetry, _CliConfigResetCommand_initOptions, _CliConfigResetCommand_initValidators;
-import { Cli } from "../../../../cli/Cli.js";
+import { cli } from "../../../../cli/cli.js";
 import { settingsNames } from "../../../../settingsNames.js";
 import AnonymousCommand from "../../../base/AnonymousCommand.js";
 import commands from "../../commands.js";
@@ -24,10 +24,10 @@ class CliConfigResetCommand extends AnonymousCommand {
     }
     async commandAction(logger, args) {
         if (args.options.key) {
-            Cli.getInstance().config.delete(args.options.key);
+            cli.getConfig().delete(args.options.key);
         }
         else {
-            Cli.getInstance().config.clear();
+            cli.getConfig().clear();
         }
     }
 }

package/dist/m365/cli/commands/config/config-set.js

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _CliConfigSetCommand_instances, _a, _CliConfigSetCommand_initTelemetry, _CliConfigSetCommand_initOptions, _CliConfigSetCommand_initValidators;
-import { Cli } from "../../../../cli/Cli.js";
+import { cli } from "../../../../cli/cli.js";
 import { settingsNames } from "../../../../settingsNames.js";
 import AnonymousCommand from "../../../base/AnonymousCommand.js";
 import commands from "../../commands.js";
@@ -41,7 +41,7 @@ class CliConfigSetCommand extends AnonymousCommand {
                 value = args.options.value;
                 break;
         }
-        Cli.getInstance().config.set(args.options.key, value);
+        cli.getConfig().set(args.options.key, value);
     }
 }
 _a = CliConfigSetCommand, _CliConfigSetCommand_instances = new WeakSet(), _CliConfigSetCommand_initTelemetry = function _CliConfigSetCommand_initTelemetry() {
@@ -79,8 +79,8 @@ _a = CliConfigSetCommand, _CliConfigSetCommand_instances = new WeakSet(), _CliCo
             return `${args.options.value} is not a valid value for the option ${args.options.key}. The number has to be higher than 0.`;
         }
         if (args.options.key === settingsNames.helpMode &&
-            Cli.helpModes.indexOf(args.options.value) === -1) {
-            return `${args.options.value} is not a valid value for the option ${args.options.key}. Allowed values: ${Cli.helpModes.join(', ')}`;
+            cli.helpModes.indexOf(args.options.value) === -1) {
+            return `${args.options.value} is not a valid value for the option ${args.options.key}. Allowed values: ${cli.helpModes.join(', ')}`;
         }
         const allowedAuthTypes = ['certificate', 'deviceCode', 'password', 'identity', 'browser', 'secret'];
         if (args.options.key === settingsNames.authType &&

package/dist/m365/commands/docs.js

@@ -1,4 +1,4 @@
-import { Cli } from '../../cli/Cli.js';
+import { cli } from '../../cli/cli.js';
 import { settingsNames } from '../../settingsNames.js';
 import { app } from '../../utils/app.js';
 import { browserUtil } from '../../utils/browserUtil.js';
@@ -13,7 +13,7 @@ class DocsCommand extends AnonymousCommand {
     }
     async commandAction(logger) {
         await logger.log(app.packageJson().homepage);
-        if (Cli.getInstance().getSettingWithDefaultValue(settingsNames.autoOpenLinksInBrowser, false) === false) {
+        if (cli.getSettingWithDefaultValue(settingsNames.autoOpenLinksInBrowser, false) === false) {
             return;
         }
         await browserUtil.open(app.packageJson().homepage);

package/dist/m365/commands/login.js

@@ -12,7 +12,7 @@ import { accessToken } from '../../utils/accessToken.js';
 import { misc } from '../../utils/misc.js';
 import commands from './commands.js';
 import { settingsNames } from '../../settingsNames.js';
-import { Cli } from '../../cli/Cli.js';
+import { cli } from '../../cli/cli.js';
 class LoginCommand extends Command {
     get name() {
         return commands.LOGIN;
@@ -37,7 +37,7 @@ class LoginCommand extends Command {
             if (this.verbose) {
                 await logger.logToStderr(`Signing in to Microsoft 365...`);
             }
-            const authType = args.options.authType || Cli.getInstance().getSettingWithDefaultValue(settingsNames.authType, 'deviceCode');
+            const authType = args.options.authType || cli.getSettingWithDefaultValue(settingsNames.authType, 'deviceCode');
             auth.service.appId = args.options.appId || config.cliAadAppId;
             auth.service.tenant = args.options.tenant || config.tenant;
             switch (authType) {
@@ -129,7 +129,7 @@ class LoginCommand extends Command {
 _a = LoginCommand, _LoginCommand_instances = new WeakSet(), _LoginCommand_initTelemetry = function _LoginCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            authType: args.options.authType || Cli.getInstance().getSettingWithDefaultValue(settingsNames.authType, 'deviceCode'),
+            authType: args.options.authType || cli.getSettingWithDefaultValue(settingsNames.authType, 'deviceCode'),
             cloud: args.options.cloud ?? CloudType.Public
         });
     });
@@ -159,7 +159,7 @@ _a = LoginCommand, _LoginCommand_instances = new WeakSet(), _LoginCommand_initTe
     });
 }, _LoginCommand_initValidators = function _LoginCommand_initValidators() {
     this.validators.push(async (args) => {
-        const authType = args.options.authType || Cli.getInstance().getSettingWithDefaultValue(settingsNames.authType, 'deviceCode');
+        const authType = args.options.authType || cli.getSettingWithDefaultValue(settingsNames.authType, 'deviceCode');
         if (authType === 'password') {
             if (!args.options.userName) {
                 return 'Required option userName missing';

package/dist/m365/commands/setup.js

@@ -6,7 +6,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SetupCommand_instances, _SetupCommand_initTelemetry, _SetupCommand_initOptions, _SetupCommand_initValidators;
 import chalk from 'chalk';
 import os from 'os';
-import { Cli } from '../../cli/Cli.js';
+import { cli } from '../../cli/cli.js';
 import { CheckStatus, formatting } from '../../utils/formatting.js';
 import { pid } from '../../utils/pid.js';
 import AnonymousCommand from '../base/AnonymousCommand.js';
@@ -43,7 +43,7 @@ class SetupCommand extends AnonymousCommand {
             return;
         }
         // stop the spinner. Fixes #5598
-        Cli.getInstance().spinner.stop();
+        cli.spinner.stop();
         await logger.logToStderr(`Welcome to the CLI for Microsoft 365 setup!`);
         await logger.logToStderr(`This command will guide you through the process of configuring the CLI for your needs.`);
         await logger.logToStderr(`Please, answer the following questions and we'll define a set of settings to best match how you intend to use the CLI.`);
@@ -56,13 +56,13 @@ class SetupCommand extends AnonymousCommand {
                 { name: 'Scripting', value: 'Scripting' }
             ]
         };
-        preferences.usageMode = await Cli.promptForSelection(usageModeConfig);
+        preferences.usageMode = await cli.promptForSelection(usageModeConfig);
         if (preferences.usageMode === 'Scripting') {
             const usedInPowerShellConfig = {
                 message: 'Are you going to use the CLI in PowerShell?',
                 default: pid.isPowerShell()
             };
-            preferences.usedInPowerShell = await Cli.promptForConfirmation(usedInPowerShellConfig);
+            preferences.usedInPowerShell = await cli.promptForConfirmation(usedInPowerShellConfig);
         }
         const experienceConfig = {
             message: 'How experienced are you in using the CLI?',
@@ -71,7 +71,7 @@ class SetupCommand extends AnonymousCommand {
                 { name: 'Proficient', value: 'Proficient' }
             ]
         };
-        preferences.experience = await Cli.promptForSelection(experienceConfig);
+        preferences.experience = await cli.promptForSelection(experienceConfig);
         const summaryConfig = {
             // invoked by inquirer
             /* c8 ignore next 6 */
@@ -81,7 +81,7 @@ class SetupCommand extends AnonymousCommand {
                 return this.getSummaryMessage(settings);
             }
         };
-        preferences.summary = await Cli.promptForConfirmation(summaryConfig);
+        preferences.summary = await cli.promptForConfirmation(summaryConfig);
         if (preferences.summary) {
             // used only for testing. Normally, we'd get the settings from the answers
             /* c8 ignore next 3 */
@@ -92,7 +92,7 @@ class SetupCommand extends AnonymousCommand {
             await logger.logToStderr('Configuring settings...');
             await logger.logToStderr('');
             // start the spinner. Fixes #5598
-            Cli.getInstance().spinner.start();
+            cli.spinner.start();
             await this.configureSettings(settings, false, logger);
             if (!this.verbose) {
                 await logger.logToStderr('');
@@ -137,7 +137,7 @@ class SetupCommand extends AnonymousCommand {
             await logger.logToStderr(JSON.stringify(settings, null, 2));
         }
         for (const [key, value] of Object.entries(settings)) {
-            Cli.getInstance().config.set(key, value);
+            cli.getConfig().set(key, value);
             if (!silent) {
                 await logger.logToStderr(formatting.getStatus(CheckStatus.Success, `${key}: ${value}`));
             }

package/dist/m365/context/commands/context-remove.js

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _ContextRemoveCommand_instances, _ContextRemoveCommand_initTelemetry, _ContextRemoveCommand_initOptions;
 import fs from 'fs';
-import { Cli } from '../../../cli/Cli.js';
+import { cli } from '../../../cli/cli.js';
 import { CommandError } from '../../../Command.js';
 import AnonymousCommand from '../../base/AnonymousCommand.js';
 import commands from '../commands.js';
@@ -27,7 +27,7 @@ class ContextRemoveCommand extends AnonymousCommand {
             await this.removeContext();
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the context?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the context?` });
             if (result) {
                 await this.removeContext();
             }

package/dist/m365/context/commands/option/option-remove.js

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _ContextOptionRemoveCommand_instances, _ContextOptionRemoveCommand_initTelemetry, _ContextOptionRemoveCommand_initOptions;
 import fs from 'fs';
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import { CommandError } from '../../../../Command.js';
 import ContextCommand from '../../../base/ContextCommand.js';
 import commands from '../../commands.js';
@@ -30,7 +30,7 @@ class ContextOptionRemoveCommand extends ContextCommand {
             await this.removeContextOption(args.options.name, logger);
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the context option ${args.options.name}?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the context option ${args.options.name}?` });
             if (result) {
                 await this.removeContextOption(args.options.name, logger);
             }

package/dist/m365/external/commands/connection/connection-doctor.js

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _ExternalConnectionDoctorCommand_instances, _a, _ExternalConnectionDoctorCommand_initOptions, _ExternalConnectionDoctorCommand_initValidators;
 import os from 'os';
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { settingsNames } from '../../../../settingsNames.js';
 import GraphCommand from '../../../base/GraphCommand.js';
@@ -28,7 +28,6 @@ class ExternalConnectionDoctorCommand extends GraphCommand {
         const ux = args.options.ux ?? 'all';
         const output = args.options.output;
         this.checksStatus = [];
-        const cli = Cli.getInstance();
         const showSpinner = cli.getSettingWithDefaultValue(settingsNames.showSpinner, true) &&
             output === 'text' &&
             typeof global.it === 'undefined';

package/dist/m365/external/commands/connection/connection-remove.js

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _ExternalConnectionRemoveCommand_instances, _ExternalConnectionRemoveCommand_initTelemetry, _ExternalConnectionRemoveCommand_initOptions, _ExternalConnectionRemoveCommand_initOptionSets;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import GraphCommand from '../../../base/GraphCommand.js';
@@ -45,7 +45,7 @@ class ExternalConnectionRemoveCommand extends GraphCommand {
             throw `The specified connection does not exist`;
         }
         const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', res.value);
-        const result = await Cli.handleMultipleResultsFound(`Multiple external connections with name ${args.options.name} found.`, resultAsKeyValuePair);
+        const result = await cli.handleMultipleResultsFound(`Multiple external connections with name ${args.options.name} found.`, resultAsKeyValuePair);
         return result.id;
     }
     async commandAction(logger, args) {
@@ -53,7 +53,7 @@ class ExternalConnectionRemoveCommand extends GraphCommand {
             await this.removeExternalConnection(args);
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the external connection '${args.options.id || args.options.name}'?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the external connection '${args.options.id || args.options.name}'?` });
             if (result) {
                 await this.removeExternalConnection(args);
             }

package/dist/m365/flow/commands/flow-remove.js

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _FlowRemoveCommand_instances, _FlowRemoveCommand_initTelemetry, _FlowRemoveCommand_initOptions, _FlowRemoveCommand_initValidators;
-import { Cli } from '../../../cli/Cli.js';
+import { cli } from '../../../cli/cli.js';
 import request from '../../../request.js';
 import { formatting } from '../../../utils/formatting.js';
 import { validation } from '../../../utils/validation.js';
@@ -53,7 +53,7 @@ class FlowRemoveCommand extends AzmgmtCommand {
             await removeFlow();
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the Microsoft Flow ${args.options.name}?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the Microsoft Flow ${args.options.name}?` });
             if (result) {
                 await removeFlow();
             }

package/dist/m365/flow/commands/owner/owner-list.js

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _FlowOwnerListCommand_instances, _FlowOwnerListCommand_initTelemetry, _FlowOwnerListCommand_initOptions, _FlowOwnerListCommand_initValidators;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
@@ -33,7 +33,7 @@ class FlowOwnerListCommand extends AzmgmtCommand {
                 await logger.logToStderr(`Listing owners for flow ${args.options.flowName} in environment ${args.options.environmentName}`);
             }
             const response = await odata.getAllItems(`${this.resource}providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/permissions?api-version=2016-11-01`);
-            if (!Cli.shouldTrimOutput(args.options.output)) {
+            if (!cli.shouldTrimOutput(args.options.output)) {
                 await logger.log(response);
             }
             else {

package/dist/m365/flow/commands/owner/owner-remove.js

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _FlowOwnerRemoveCommand_instances, _FlowOwnerRemoveCommand_initTelemetry, _FlowOwnerRemoveCommand_initOptions, _FlowOwnerRemoveCommand_initValidators, _FlowOwnerRemoveCommand_initOptionSets;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { aadGroup } from '../../../../utils/aadGroup.js';
 import { aadUser } from '../../../../utils/aadUser.js';
@@ -66,7 +66,7 @@ class FlowOwnerRemoveCommand extends AzmgmtCommand {
                 await removeFlowOwner();
             }
             else {
-                const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove owner '${args.options.groupId || args.options.groupName || args.options.userId || args.options.userName}' from the specified flow?` });
+                const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove owner '${args.options.groupId || args.options.groupName || args.options.userId || args.options.userName}' from the specified flow?` });
                 if (result) {
                     await removeFlowOwner();
                 }

package/dist/m365/flow/commands/run/run-cancel.js

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _FlowRunCancelCommand_instances, _FlowRunCancelCommand_initTelemetry, _FlowRunCancelCommand_initOptions, _FlowRunCancelCommand_initValidators;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
@@ -47,7 +47,7 @@ class FlowRunCancelCommand extends AzmgmtCommand {
             await cancelFlow();
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to cancel the flow run ${args.options.name}?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to cancel the flow run ${args.options.name}?` });
             if (result) {
                 await cancelFlow();
             }

package/dist/m365/flow/commands/run/run-resubmit.js

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _FlowRunResubmitCommand_instances, _FlowRunResubmitCommand_initTelemetry, _FlowRunResubmitCommand_initOptions, _FlowRunResubmitCommand_initValidators;
 import chalk from 'chalk';
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
@@ -52,7 +52,7 @@ class FlowRunResubmitCommand extends AzmgmtCommand {
             await resubmitFlow();
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to resubmit the flow with run ${args.options.name}?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to resubmit the flow with run ${args.options.name}?` });
             if (result) {
                 await resubmitFlow();
             }

package/dist/m365/graph/commands/changelog/changelog-list.js

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _GraphChangelogListCommand_instances, _GraphChangelogListCommand_initTelemetry, _GraphChangelogListCommand_initOptions, _GraphChangelogListCommand_initValidators;
 import { DOMParser } from '@xmldom/xmldom';
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { md } from '../../../../utils/md.js';
 import { validation } from '../../../../utils/validation.js';
@@ -94,14 +94,14 @@ class GraphChangelogListCommand extends AnonymousCommand {
             items: []
         };
         Array.from(xmlDoc.getElementsByTagName('item')).forEach((item) => {
-            const description = Cli.shouldTrimOutput(args.options.output) ?
+            const description = cli.shouldTrimOutput(args.options.output) ?
                 md.md2plain(item.getElementsByTagName('description').item(0).textContent, '') :
                 item.getElementsByTagName('description').item(0).textContent;
             changelog.items.push({
                 guid: item.getElementsByTagName('guid').item(0).textContent,
                 category: item.getElementsByTagName('category').item(1).textContent,
                 title: item.getElementsByTagName('title').item(0).textContent,
-                description: Cli.shouldTrimOutput(args.options.output) ?
+                description: cli.shouldTrimOutput(args.options.output) ?
                     description.length > 50 ? `${description.substring(0, 47)}...` : description :
                     description,
                 pubDate: new Date(item.getElementsByTagName('pubDate').item(0).textContent)