@pnp/cli-microsoft365 7.2.0-beta.0642f3a → 7.2.0-beta.11c70fc

package/dist/index.js

@@ -1,11 +1,7 @@
 #!/usr/bin/env node
-import fs from 'fs';
-import path from 'path';
-import url from 'url';
 import { Cli } from './cli/Cli.js';
 import { telemetry } from './telemetry.js';
 import { app } from './utils/app.js';
-const __dirname = url.fileURLToPath(new URL('.', import.meta.url));
 // required to make console.log() in combination with piped output synchronous
 // on Windows/in PowerShell so that the output is not trimmed by calling
 // process.exit() after executing the command, while the output is still
@@ -18,14 +14,12 @@ if (!process.env.CLIMICROSOFT365_NOUPDATE) {
         updateNotifier.default({ pkg: app.packageJson() }).notify({ defer: false });
     });
 }
-fs.realpath(__dirname, async (err, resolvedPath) => {
-    try {
-        const cli = Cli.getInstance();
-        await cli.execute(path.join(resolvedPath, 'm365'), process.argv.slice(2));
-    }
-    catch (e) {
-        telemetry.trackException(e);
-        process.exit(1);
-    }
-});
+try {
+    const cli = Cli.getInstance();
+    cli.execute(process.argv.slice(2));
+}
+catch (e) {
+    telemetry.trackException(e);
+    process.exit(1);
+}
 //# sourceMappingURL=index.js.map

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

@@ -50,13 +50,8 @@ class AadAdministrativeUnitRemoveCommand extends GraphCommand {
             await removeAdministrativeUnit();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove administrative unit '${args.options.id || args.options.displayName}'?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove administrative unit '${args.options.id || args.options.displayName}'?` });
+            if (result) {
                 await removeAdministrativeUnit();
             }
         }

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

@@ -49,13 +49,8 @@ class AadAppRemoveCommand extends GraphCommand {
             await deleteApp();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the app?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the app?` });
+            if (result) {
                 await deleteApp();
             }
         }

package/dist/m365/aad/commands/app/app-role-remove.js

@@ -38,13 +38,8 @@ class AadAppRoleRemoveCommand extends GraphCommand {
             await deleteAppRole();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the app role ?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the app role?` });
+            if (result) {
                 await deleteAppRole();
             }
         }

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

@@ -111,13 +111,8 @@ class AadAppRoleAssignmentRemoveCommand extends GraphCommand {
             await removeAppRoleAssignment();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the appRoleAssignment with scopes ${args.options.scopes} for resource ${args.options.resource}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the appRoleAssignment with scope ${args.options.scope} for resource ${args.options.resource}?` });
+            if (result) {
                 await removeAppRoleAssignment();
             }
         }

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

@@ -52,13 +52,8 @@ class AadGroupRemoveCommand extends GraphCommand {
             await removeGroup();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove group '${args.options.id || args.options.displayName}'?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove group '${args.options.id || args.options.displayName}'?` });
+            if (result) {
                 await removeGroup();
             }
         }

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

@@ -45,13 +45,8 @@ class AadGroupSettingRemoveCommand extends GraphCommand {
             await removeGroupSetting();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the group setting ${args.options.id}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the group setting ${args.options.id}?` });
+            if (result) {
                 await removeGroupSetting();
             }
         }

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

@@ -35,13 +35,8 @@ class AadM365GroupRecycleBinItemClearCommand extends GraphCommand {
             await clearM365GroupRecycleBinItems();
         }
         else {
-            const response = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to clear all M365 Groups from recycle bin ?`
-            });
-            if (response.continue) {
+            const response = await Cli.promptForConfirmation({ message: `Are you sure you want to clear all M365 Groups from recycle bin?` });
+            if (response) {
                 await clearM365GroupRecycleBinItems();
             }
         }

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

@@ -46,13 +46,8 @@ class AadM365GroupRecycleBinItemRemoveCommand extends GraphCommand {
             await removeGroup();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the group '${args.options.id || args.options.displayName || args.options.mailNickname}'?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the group '${args.options.id || args.options.displayName || args.options.mailNickname}'?` });
+            if (result) {
                 await removeGroup();
             }
         }

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

@@ -56,13 +56,8 @@ class AadM365GroupRemoveCommand extends GraphCommand {
             await removeGroup();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the group ${args.options.id}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the group ${args.options.id}?` });
+            if (result) {
                 await removeGroup();
             }
         }

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

@@ -92,13 +92,8 @@ class AadM365GroupUserRemoveCommand extends GraphCommand {
             await removeUser();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove ${args.options.userName} from the ${(typeof args.options.groupId !== 'undefined' ? 'group' : 'team')} ${groupId}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove ${args.options.userName} from the ${(typeof args.options.groupId !== 'undefined' ? 'group' : 'team')} ${groupId}?` });
+            if (result) {
                 await removeUser();
             }
         }

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

@@ -44,13 +44,8 @@ class AadOAuth2GrantRemoveCommand extends GraphCommand {
             await removeOauth2Grant();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the OAuth2 permissions for ${args.options.grantId}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the OAuth2 permissions for ${args.options.grantId}?` });
+            if (result) {
                 await removeOauth2Grant();
             }
         }

package/dist/m365/aad/commands/siteclassification/siteclassification-disable.js

@@ -63,13 +63,8 @@ class AadSiteClassificationDisableCommand extends GraphCommand {
             await disableSiteClassification();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to disable site classification?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to disable site classification?` });
+            if (result) {
                 await disableSiteClassification();
             }
         }

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

@@ -32,13 +32,8 @@ class AadUserLicenseRemoveCommand extends GraphCommand {
             await this.deleteUserLicenses(args);
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the licenses for the user '${args.options.userId || args.options.userName}'?`
-            });
-            if (result.continue) {
+            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

@@ -63,13 +63,8 @@ class AadUserRecycleBinItemClearCommand extends GraphCommand {
             await clearRecycleBinUsers();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: 'Are you sure you want to permanently delete all deleted users?'
-            });
-            if (result.continue) {
+            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

@@ -43,13 +43,8 @@ class AadUserRecycleBinItemRemoveCommand extends GraphCommand {
             await clearRecycleBinItem();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to permanently delete the user with id ${args.options.id}?`
-            });
-            if (result.continue) {
+            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

@@ -32,13 +32,8 @@ class AadUserRemoveCommand extends GraphCommand {
             await this.deleteUser(args);
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove user '${args.options.id || args.options.userName}'?`
-            });
-            if (result.continue) {
+            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/commands/setup.js

@@ -12,7 +12,6 @@ import { pid } from '../../utils/pid.js';
 import AnonymousCommand from '../base/AnonymousCommand.js';
 import commands from './commands.js';
 import { interactivePreset, powerShellPreset, scriptingPreset } from './setupPresets.js';
-import { prompt } from '../../utils/prompt.js';
 class SetupCommand extends AnonymousCommand {
     get name() {
         return commands.SETUP;
@@ -23,8 +22,6 @@ class SetupCommand extends AnonymousCommand {
     constructor() {
         super();
         _SetupCommand_instances.add(this);
-        // used for injecting answers from tests
-        this.answers = {};
         __classPrivateFieldGet(this, _SetupCommand_instances, "m", _SetupCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SetupCommand_instances, "m", _SetupCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SetupCommand_instances, "m", _SetupCommand_initValidators).call(this);
@@ -51,43 +48,40 @@ class SetupCommand extends AnonymousCommand {
         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.`);
         await logger.logToStderr('');
-        const preferences = await prompt.forInput([
-            {
-                type: 'list',
-                name: 'usageMode',
-                message: 'How do you plan to use the CLI?',
-                choices: [
-                    'Interactively',
-                    'Scripting'
-                ]
-            },
-            {
-                type: 'confirm',
-                name: 'usedInPowerShell',
+        const preferences = {};
+        const usageModeConfig = {
+            message: 'How do you plan to use the CLI?',
+            choices: [
+                { name: 'Interactively', value: 'Interactively' },
+                { name: 'Scripting', value: 'Scripting' }
+            ]
+        };
+        preferences.usageMode = await Cli.promptForSelection(usageModeConfig);
+        if (preferences.usageMode === 'Scripting') {
+            const usedInPowerShellConfig = {
                 message: 'Are you going to use the CLI in PowerShell?',
-                when: (answers) => answers.usageMode === 'Scripting',
                 default: pid.isPowerShell()
-            },
-            {
-                type: 'list',
-                name: 'experience',
-                message: 'How experienced are you in using the CLI?',
-                choices: [
-                    'Beginner',
-                    'Proficient'
-                ]
-            },
-            {
-                type: 'confirm',
-                name: 'summary',
-                // invoked by inquirer
-                /* c8 ignore next 4 */
-                message: (answers) => {
-                    settings = this.getSettings(answers);
-                    return this.getSummaryMessage(settings);
-                }
+            };
+            preferences.usedInPowerShell = await Cli.promptForConfirmation(usedInPowerShellConfig);
+        }
+        const experienceConfig = {
+            message: 'How experienced are you in using the CLI?',
+            choices: [
+                { name: 'Beginner', value: 'Beginner' },
+                { name: 'Proficient', value: 'Proficient' }
+            ]
+        };
+        preferences.experience = await Cli.promptForSelection(experienceConfig);
+        const summaryConfig = {
+            // invoked by inquirer
+            /* c8 ignore next 6 */
+            message: async () => {
+                settings = this.getSettings(preferences);
+                // eslint-disable-next-line @typescript-eslint/no-unused-vars
+                return this.getSummaryMessage(settings);
             }
-        ], this.answers);
+        };
+        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 */

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

@@ -27,13 +27,8 @@ class ContextRemoveCommand extends AnonymousCommand {
             await this.removeContext();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the context?`
-            });
-            if (result.continue) {
+            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

@@ -30,13 +30,8 @@ class ContextOptionRemoveCommand extends ContextCommand {
             await this.removeContextOption(args.options.name, logger);
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the context option ${args.options.name}?`
-            });
-            if (result.continue) {
+            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-remove.js

@@ -53,13 +53,8 @@ class ExternalConnectionRemoveCommand extends GraphCommand {
             await this.removeExternalConnection(args);
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the external connection '${args.options.id || args.options.name}'?`
-            });
-            if (result.continue) {
+            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/environment/environment-list.js

@@ -17,10 +17,12 @@ class FlowEnvironmentListCommand extends AzmgmtCommand {
         }
         try {
             const res = await odata.getAllItems(`${this.resource}providers/Microsoft.ProcessSimple/environments?api-version=2016-11-01`);
-            if (args.options.output !== 'json' && res.length > 0) {
-                res.forEach(e => {
-                    e.displayName = e.properties.displayName;
-                });
+            if (res.length > 0) {
+                if (args.options.output !== 'json') {
+                    res.forEach(e => {
+                        e.displayName = e.properties.displayName;
+                    });
+                }
                 await logger.log(res);
             }
         }

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

@@ -53,13 +53,8 @@ class FlowRemoveCommand extends AzmgmtCommand {
             await removeFlow();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the Microsoft Flow ${args.options.name}?`
-            });
-            if (result.continue) {
+            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-remove.js

@@ -66,13 +66,8 @@ class FlowOwnerRemoveCommand extends AzmgmtCommand {
                 await removeFlowOwner();
             }
             else {
-                const result = await Cli.prompt({
-                    type: 'confirm',
-                    name: 'continue',
-                    default: false,
-                    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.continue) {
+                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

@@ -47,13 +47,8 @@ class FlowRunCancelCommand extends AzmgmtCommand {
             await cancelFlow();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to cancel the flow run ${args.options.name}?`
-            });
-            if (result.continue) {
+            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

@@ -52,13 +52,8 @@ class FlowRunResubmitCommand extends AzmgmtCommand {
             await resubmitFlow();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to resubmit the flow with run ${args.options.name}?`
-            });
-            if (result.continue) {
+            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/schemaextension/schemaextension-remove.js

@@ -45,13 +45,8 @@ class GraphSchemaExtensionRemoveCommand extends GraphCommand {
             await removeSchemaExtension();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the schema extension with ID ${args.options.id}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the schema extension with ID ${args.options.id}?` });
+            if (result) {
                 await removeSchemaExtension();
             }
         }

package/dist/m365/pa/commands/app/app-consent-set.js

@@ -31,13 +31,8 @@ class PaAppConsentSetCommand extends PowerAppsCommand {
             await this.consentPaApp(args);
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you bypass the consent for the Microsoft Power App ${args.options.name} to ${args.options.bypass}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you bypass the consent for the Microsoft Power App ${args.options.name} to ${args.options.bypass}?` });
+            if (result) {
                 await this.consentPaApp(args);
             }
         }

package/dist/m365/pa/commands/app/app-permission-remove.js

@@ -35,13 +35,8 @@ class PaAppPermissionRemoveCommand extends PowerAppsCommand {
                 await this.removeAppPermission(logger, args.options);
             }
             else {
-                const result = await Cli.prompt({
-                    type: 'confirm',
-                    name: 'continue',
-                    default: false,
-                    message: `Are you sure you want to remove the permissions of '${args.options.userId || args.options.userName || args.options.groupId || args.options.groupName || (args.options.tenant && 'everyone')}' from the Power App '${args.options.appName}'?`
-                });
-                if (result.continue) {
+                const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the permissions of '${args.options.userId || args.options.userName || args.options.groupId || args.options.groupName || (args.options.tenant && 'everyone')}' from the Power App '${args.options.appName}'?` });
+                if (result) {
                     await this.removeAppPermission(logger, args.options);
                 }
             }

package/dist/m365/pa/commands/app/app-remove.js

@@ -54,13 +54,8 @@ class PaAppRemoveCommand extends PowerAppsCommand {
             await removePaApp();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the Microsoft Power App ${args.options.name}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the Microsoft Power App ${args.options.name}?` });
+            if (result) {
                 await removePaApp();
             }
         }

package/dist/m365/planner/commands/bucket/bucket-remove.js

@@ -50,13 +50,8 @@ class PlannerBucketRemoveCommand extends GraphCommand {
             await removeBucket();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the bucket ${args.options.id || args.options.name}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the bucket ${args.options.id || args.options.name}?` });
+            if (result) {
                 await removeBucket();
             }
         }