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

package/dist/Auth.js

@@ -2,7 +2,7 @@ import { AzureCloudInstance } from '@azure/msal-common';
 import { CommandError } from './Command.js';
 import { FileTokenStorage } from './auth/FileTokenStorage.js';
 import { msalCachePlugin } from './auth/msalCachePlugin.js';
-import { Cli } from './cli/Cli.js';
+import { cli } from './cli/cli.js';
 import config from './config.js';
 import request from './request.js';
 import { settingsNames } from './settingsNames.js';
@@ -338,7 +338,6 @@ export class Auth {
             await logger.logToStderr(response);
             await logger.logToStderr('');
         }
-        const cli = Cli.getInstance();
         cli.spinner.text = response.message;
         cli.spinner.spinner = {
             frames: ['🌶️ ']
@@ -348,10 +347,10 @@ export class Auth {
         if (!cli.spinner.isSpinning && typeof global.it === 'undefined') {
             cli.spinner.start();
         }
-        if (Cli.getInstance().getSettingWithDefaultValue(settingsNames.autoOpenLinksInBrowser, false)) {
+        if (cli.getSettingWithDefaultValue(settingsNames.autoOpenLinksInBrowser, false)) {
             browserUtil.open(response.verificationUri);
         }
-        if (Cli.getInstance().getSettingWithDefaultValue(settingsNames.copyDeviceCodeToClipboard, false)) {
+        if (cli.getSettingWithDefaultValue(settingsNames.copyDeviceCodeToClipboard, false)) {
             // _clipboardy is never set before hitting this line, but this check
             // is implemented so that we can support lazy loading
             // but also stub it for testing

package/dist/Command.js

@@ -6,7 +6,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _Command_instances, _Command_initTelemetry, _Command_initOptions, _Command_initValidators;
 import os from 'os';
 import auth from './Auth.js';
-import { Cli } from './cli/Cli.js';
+import { cli } from './cli/cli.js';
 import request from './request.js';
 import { settingsNames } from './settingsNames.js';
 import { telemetry } from './telemetry.js';
@@ -75,7 +75,7 @@ class Command {
         return true;
     }
     async validateRequiredOptions(args, command) {
-        const shouldPrompt = Cli.getInstance().getSettingWithDefaultValue(settingsNames.prompt, true);
+        const shouldPrompt = cli.getSettingWithDefaultValue(settingsNames.prompt, true);
         let prompted = false;
         for (let i = 0; i < command.options.length; i++) {
             const optionInfo = command.options[i];
@@ -88,7 +88,7 @@ class Command {
             }
             if (!prompted) {
                 prompted = true;
-                Cli.error('🌶️  Provide values for the following parameters:');
+                cli.error('🌶️  Provide values for the following parameters:');
             }
             const answer = optionInfo.autocomplete !== undefined
                 ? await prompt.forSelection({ message: `${optionInfo.name}: `, choices: optionInfo.autocomplete.map((choice) => { return { name: choice, value: choice }; }) })
@@ -96,7 +96,7 @@ class Command {
             args.options[optionInfo.name] = answer;
         }
         if (prompted) {
-            Cli.error('');
+            cli.error('');
         }
         this.processOptions(args.options);
         return true;
@@ -106,7 +106,7 @@ class Command {
         if (!optionsSets || optionsSets.length === 0) {
             return true;
         }
-        const shouldPrompt = Cli.getInstance().getSettingWithDefaultValue(settingsNames.prompt, true);
+        const shouldPrompt = cli.getSettingWithDefaultValue(settingsNames.prompt, true);
         const argsOptions = Object.keys(args.options);
         for (const optionSet of optionsSets.sort(opt => opt.runsWhen ? 0 : 1)) {
             if (optionSet.runsWhen && !optionSet.runsWhen(args)) {
@@ -129,17 +129,17 @@ class Command {
         return true;
     }
     async promptForOptionSetNameAndValue(args, optionSet) {
-        Cli.error(`🌶️  Please specify one of the following options:`);
+        cli.error(`🌶️  Please specify one of the following options:`);
         const selectedOptionName = await prompt.forSelection({ message: `Option to use:`, choices: optionSet.options.map((choice) => { return { name: choice, value: choice }; }) });
         const optionValue = await prompt.forInput({ message: `${selectedOptionName}:` });
         args.options[selectedOptionName] = optionValue;
-        Cli.error('');
+        cli.error('');
     }
     async promptForSpecificOption(args, commonOptions) {
-        Cli.error(`🌶️  Multiple options for an option set specified. Please specify the correct option that you wish to use.`);
+        cli.error(`🌶️  Multiple options for an option set specified. Please specify the correct option that you wish to use.`);
         const selectedOptionName = await prompt.forSelection({ message: `Option to use:`, choices: commonOptions.map((choice) => { return { name: choice, value: choice }; }) });
         commonOptions.filter(y => y !== selectedOptionName).map(optionName => args.options[optionName] = undefined);
-        Cli.error('');
+        cli.error('');
     }
     async validateOutput(args) {
         if (args.options.output &&
@@ -376,7 +376,6 @@ class Command {
         });
     }
     async showDeprecationWarning(logger, deprecated, recommended) {
-        const cli = Cli.getInstance();
         if (cli.currentCommandName &&
             cli.currentCommandName.indexOf(deprecated) === 0) {
             const chalk = (await import('chalk')).default;
@@ -388,7 +387,6 @@ class Command {
         await logger.logToStderr(chalk.yellow(warning));
     }
     getUsedCommandName() {
-        const cli = Cli.getInstance();
         const commandName = this.getCommandName();
         if (!cli.currentCommandName) {
             return commandName;
@@ -456,7 +454,6 @@ class Command {
     }
     async getCsvOutput(logStatement, options) {
         const { stringify } = await import('csv-stringify/sync');
-        const cli = Cli.getInstance();
         if (logStatement && logStatement.length > 0 && !options.query) {
             logStatement.map(l => {
                 for (const x of Object.keys(l)) {
@@ -474,7 +471,7 @@ class Command {
         return stringify(logStatement, {
             header: cli.getSettingWithDefaultValue(settingsNames.csvHeader, true),
             escape: cli.getSettingWithDefaultValue(settingsNames.csvEscape, '"'),
-            quote: cli.config.get(settingsNames.csvQuote),
+            quote: cli.getConfig().get(settingsNames.csvQuote),
             quoted: cli.getSettingWithDefaultValue(settingsNames.csvQuoted, false),
             // eslint-disable-next-line camelcase
             quoted_empty: cli.getSettingWithDefaultValue(settingsNames.csvQuotedEmpty, false)

package/dist/api.js

@@ -1,11 +1,10 @@
-import { Cli } from "./cli/Cli.js";
+import { cli } from "./cli/cli.js";
 export async function executeCommand(commandName, options, listener) {
-    const cli = Cli.getInstance();
     cli.loadAllCommandsInfo();
     await cli.loadCommandFromArgs(commandName.split(' '));
     if (!cli.commandToExecute) {
         return Promise.reject(`Command not found: ${commandName}`);
     }
-    return Cli.executeCommandWithOutput(cli.commandToExecute.command, { options: options ?? {} }, listener);
+    return cli.executeCommandWithOutput(cli.commandToExecute.command, { options: options ?? {} }, listener);
 }
 //# sourceMappingURL=api.js.map

package/dist/autocomplete.js

@@ -4,7 +4,7 @@ import omelette from 'omelette';
 import os from 'os';
 import path from 'path';
 import url from 'url';
-import { Cli } from './cli/Cli.js';
+import { cli } from './cli/cli.js';
 const __dirname = url.fileURLToPath(new URL('.', import.meta.url));
 class Autocomplete {
     constructor() {
@@ -71,16 +71,14 @@ class Autocomplete {
         data.reply(replies);
     }
     generateShCompletion() {
-        const cli = Cli.getInstance();
-        const commandsInfo = this.getCommandsInfo(cli);
+        const commandsInfo = this.getCommandsInfo();
         fs.writeFileSync(Autocomplete.autocompleteFilePath, JSON.stringify(commandsInfo));
     }
     setupShCompletion() {
         this.omelette.setupShellInitFile();
     }
     getClinkCompletion() {
-        const cli = Cli.getInstance();
-        const cmd = this.getCommandsInfo(cli);
+        const cmd = this.getCommandsInfo();
         const lua = ['local parser = clink.arg.new_parser'];
         const functions = {};
         this.buildClinkForBranch(cmd, functions, 'm365');
@@ -136,7 +134,7 @@ class Autocomplete {
     getLuaFunctionName(functionName) {
         return functionName.replace(/-/g, '_');
     }
-    getCommandsInfo(cli) {
+    getCommandsInfo() {
         const commandsInfo = {};
         const commands = cli.commands;
         commands.forEach(c => {

package/dist/chili/chili.js

@@ -2,7 +2,7 @@ import fs from 'fs';
 import ora from 'ora';
 import path from 'path';
 import url from 'url';
-import { Cli } from '../cli/Cli.js';
+import { cli } from '../cli/cli.js';
 import request from '../request.js';
 import { settingsNames } from '../settingsNames.js';
 import { md } from '../utils/md.js';
@@ -15,7 +15,6 @@ let promptForRating = true;
 let conversationId = 0;
 let initialPrompt = '';
 let history = [];
-const cli = Cli.getInstance();
 const showSpinner = cli.getSettingWithDefaultValue(settingsNames.showSpinner, true) && typeof global.it === 'undefined';
 request.logger = {
     /* c8 ignore next 3 */