@pnp/cli-microsoft365 7.1.0-beta.d53f0d9 → 7.2.0-beta.0642f3a

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

@@ -10,16 +10,21 @@ import { aadGroup } from '../../../../utils/aadGroup.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+import config from '../../../../config.js';
+import { formatting } from '../../../../utils/formatting.js';
+import { spo } from '../../../../utils/spo.js';
+import { setTimeout } from 'timers/promises';
 class AadM365GroupRemoveCommand extends GraphCommand {
     get name() {
         return commands.M365GROUP_REMOVE;
     }
     get description() {
-        return 'Removes an Microsoft 365 Group';
+        return 'Removes a Microsoft 365 Group';
     }
     constructor() {
         super();
         _AadM365GroupRemoveCommand_instances.add(this);
+        this.intervalInMs = 5000;
         __classPrivateFieldGet(this, _AadM365GroupRemoveCommand_instances, "m", _AadM365GroupRemoveCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _AadM365GroupRemoveCommand_instances, "m", _AadM365GroupRemoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _AadM365GroupRemoveCommand_instances, "m", _AadM365GroupRemoveCommand_initValidators).call(this);
@@ -34,21 +39,13 @@ class AadM365GroupRemoveCommand extends GraphCommand {
                 if (!isUnifiedGroup) {
                     throw Error(`Specified group with id '${args.options.id}' is not a Microsoft 365 group.`);
                 }
-                const requestOptions = {
-                    url: `${this.resource}/v1.0/groups/${args.options.id}`,
-                    headers: {
-                        'accept': 'application/json;odata.metadata=none'
-                    }
-                };
-                await request.delete(requestOptions);
+                const siteUrl = await this.getM365GroupSiteUrl(logger, args.options.id);
+                const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
+                // Delete the Microsoft 365 group site. This operation will also delete the group.
+                await this.deleteM365GroupSite(logger, siteUrl, spoAdminUrl);
                 if (args.options.skipRecycleBin) {
-                    const requestOptions2 = {
-                        url: `${this.resource}/v1.0/directory/deletedItems/${args.options.id}`,
-                        headers: {
-                            'accept': 'application/json;odata.metadata=none'
-                        }
-                    };
-                    await request.delete(requestOptions2);
+                    await this.deleteM365GroupFromRecycleBin(logger, args.options.id);
+                    await this.deleteSiteFromRecycleBin(logger, siteUrl, spoAdminUrl);
                 }
             }
             catch (err) {
@@ -70,6 +67,102 @@ class AadM365GroupRemoveCommand extends GraphCommand {
             }
         }
     }
+    async getM365GroupSiteUrl(logger, id) {
+        if (this.verbose) {
+            await logger.logToStderr(`Getting the site URL of Microsoft 365 Group: ${id}...`);
+        }
+        const requestOptions = {
+            url: `${this.resource}/v1.0/groups/${id}/drive?$select=webUrl`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        const res = await request.get(requestOptions);
+        // Extract the base URL by removing everything after the last '/' character in the URL.
+        const baseUrl = res.webUrl.substring(0, res.webUrl.lastIndexOf('/'));
+        return baseUrl;
+    }
+    async deleteM365GroupSite(logger, url, spoAdminUrl) {
+        if (this.verbose) {
+            await logger.logToStderr(`Deleting the group site: '${url}'...`);
+        }
+        const requestOptions = {
+            url: `${spoAdminUrl}/_api/GroupSiteManager/Delete?siteUrl='${url}'`,
+            headers: {
+                accept: 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
+        };
+        await request.post(requestOptions);
+    }
+    async deleteM365GroupFromRecycleBin(logger, id) {
+        for (let retries = 0; retries < AadM365GroupRemoveCommand.maxRetries; retries++) {
+            if (await this.isM365GroupInDeletedItemsList(id)) {
+                await this.removeM365GroupPermanently(logger, id);
+                return;
+            }
+            else {
+                if (this.verbose) {
+                    await logger.logToStderr(`Group has not been deleted yet. Waiting for ${this.intervalInMs / 1000} seconds before the next attempt. ${AadM365GroupRemoveCommand.maxRetries - retries} attempts remaining...`);
+                }
+                await setTimeout(this.intervalInMs);
+            }
+        }
+        await logger.logToStderr(`Group has been successfully deleted, but it couldn't be permanently removed from the recycle bin after all retries. It will still appear in the deleted groups list.`);
+    }
+    async removeM365GroupPermanently(logger, id) {
+        if (this.verbose) {
+            await logger.logToStderr(`Group has been deleted and is now available in the deleted groups list. Removing permanently...`);
+        }
+        const requestOptions = {
+            url: `${this.resource}/v1.0/directory/deletedItems/${id}`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            }
+        };
+        await request.delete(requestOptions);
+    }
+    async isM365GroupInDeletedItemsList(id) {
+        const requestOptions = {
+            url: `${this.resource}/v1.0/directory/deletedItems/${id}`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        try {
+            const response = await request.get(requestOptions);
+            return Boolean(response && response.id);
+        }
+        catch (error) {
+            if (error.response && error.response.status === 404) {
+                return false;
+            }
+            else {
+                throw error;
+            }
+        }
+    }
+    async deleteSiteFromRecycleBin(logger, url, spoAdminUrl) {
+        if (this.verbose) {
+            await logger.logToStderr(`Deleting the M365 group site '${url}' from the recycle bin...`);
+        }
+        const res = await spo.ensureFormDigest(spoAdminUrl, logger, undefined, this.debug);
+        const requestOptions = {
+            url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+            headers: {
+                'X-RequestDigest': res.FormDigestValue
+            },
+            data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="185" ObjectPathId="184" /><Query Id="186" ObjectPathId="184"><Query SelectAllProperties="false"><Properties><Property Name="IsComplete" ScalarProperty="true" /><Property Name="PollingInterval" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Method Id="184" ParentId="175" Name="RemoveDeletedSite"><Parameters><Parameter Type="String">${formatting.escapeXml(url)}</Parameter></Parameters></Method><Constructor Id="175" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+        };
+        const processQuery = await request.post(requestOptions);
+        const json = JSON.parse(processQuery);
+        const response = json[0];
+        if (response.ErrorInfo) {
+            throw response.ErrorInfo.ErrorMessage;
+        }
+    }
 }
 _AadM365GroupRemoveCommand_instances = new WeakSet(), _AadM365GroupRemoveCommand_initTelemetry = function _AadM365GroupRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
@@ -94,5 +187,6 @@ _AadM365GroupRemoveCommand_instances = new WeakSet(), _AadM365GroupRemoveCommand
         return true;
     });
 };
+AadM365GroupRemoveCommand.maxRetries = 10;
 export default new AadM365GroupRemoveCommand();
 //# sourceMappingURL=m365group-remove.js.map

package/dist/m365/aad/commands.js

@@ -1,5 +1,9 @@
 const prefix = 'aad';
 export default {
+    ADMINISTRATIVEUNIT_ADD: `${prefix} administrativeunit add`,
+    ADMINISTRATIVEUNIT_GET: `${prefix} administrativeunit get`,
+    ADMINISTRATIVEUNIT_LIST: `${prefix} administrativeunit list`,
+    ADMINISTRATIVEUNIT_REMOVE: `${prefix} administrativeunit remove`,
     APP_ADD: `${prefix} app add`,
     APP_GET: `${prefix} app get`,
     APP_LIST: `${prefix} app list`,
@@ -14,6 +18,7 @@ export default {
     GROUP_GET: `${prefix} group get`,
     GROUP_LIST: `${prefix} group list`,
     GROUP_REMOVE: `${prefix} group remove`,
+    GROUP_USER_LIST: `${prefix} group user list`,
     GROUPSETTING_ADD: `${prefix} groupsetting add`,
     GROUPSETTING_GET: `${prefix} groupsetting get`,
     GROUPSETTING_LIST: `${prefix} groupsetting list`,

package/dist/m365/base/AppCommand.js

@@ -8,6 +8,7 @@ import fs from 'fs';
 import { Cli } from '../../cli/Cli.js';
 import Command, { CommandError } from '../../Command.js';
 import { validation } from '../../utils/validation.js';
+import { formatting } from '../../utils/formatting.js';
 class AppCommand extends Command {
     get resource() {
         return 'https://graph.microsoft.com';
@@ -52,18 +53,8 @@ class AppCommand extends Command {
             return super.action(logger, args);
         }
         if (this.m365rcJson.apps.length > 1) {
-            const result = await Cli.prompt({
-                message: `Multiple Azure AD apps found in ${m365rcJsonPath}. Which app would you like to use?`,
-                type: 'list',
-                choices: this.m365rcJson.apps.map((app, i) => {
-                    return {
-                        name: `${app.name} (${app.appId})`,
-                        value: i
-                    };
-                }),
-                default: 0,
-                name: 'appIdIndex'
-            });
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('appIdIndex', this.m365rcJson.apps);
+            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/cli/commands/cli-doctor.js

@@ -14,11 +14,14 @@ class CliDoctorCommand extends Command {
     }
     async commandAction(logger) {
         const roles = [];
-        const scopes = [];
+        const scopes = new Map();
         Object.keys(auth.service.accessTokens).forEach(resource => {
             const accessToken = auth.service.accessTokens[resource].accessToken;
             this.getRolesFromAccessToken(accessToken).forEach(role => roles.push(role));
-            this.getScopesFromAccessToken(accessToken).forEach(scope => scopes.push(scope));
+            const [res, scp] = this.getScopesFromAccessToken(accessToken);
+            if (res !== "") {
+                scopes.set(res, scp);
+            }
         });
         const diagnosticInfo = {
             os: {
@@ -34,7 +37,7 @@ class CliDoctorCommand extends Command {
             cliEnvironment: process.env.CLIMICROSOFT365_ENV ? process.env.CLIMICROSOFT365_ENV : '',
             cliConfig: Cli.getInstance().config.all,
             roles: roles,
-            scopes: scopes
+            scopes: Object.fromEntries(scopes)
         };
         await logger.log(diagnosticInfo);
     }
@@ -55,20 +58,22 @@ class CliDoctorCommand extends Command {
         return roles;
     }
     getScopesFromAccessToken(accessToken) {
+        let resource = "";
         let scopes = [];
         if (!accessToken || accessToken.length === 0) {
-            return scopes;
+            return [resource, scopes];
         }
         const chunks = accessToken.split('.');
         if (chunks.length !== 3) {
-            return scopes;
+            return [resource, scopes];
         }
         const tokenString = Buffer.from(chunks[1], 'base64').toString();
         const token = JSON.parse(tokenString);
         if (token.scp?.length > 0) {
+            resource = token.aud.replace(/(-my|-admin).sharepoint.com/, '.sharepoint.com');
             scopes = token.scp.split(' ');
         }
-        return scopes;
+        return [resource, scopes];
     }
 }
 export default new CliDoctorCommand();

package/dist/m365/commands/setup.js

@@ -12,6 +12,7 @@ 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;
@@ -44,11 +45,13 @@ class SetupCommand extends AnonymousCommand {
             await this.configureSettings(settings, true, logger);
             return;
         }
+        // stop the spinner. Fixes #5598
+        Cli.getInstance().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.`);
         await logger.logToStderr('');
-        const preferences = await Cli.prompt([
+        const preferences = await prompt.forInput([
             {
                 type: 'list',
                 name: 'usageMode',
@@ -94,6 +97,8 @@ class SetupCommand extends AnonymousCommand {
             await logger.logToStderr('');
             await logger.logToStderr('Configuring settings...');
             await logger.logToStderr('');
+            // start the spinner. Fixes #5598
+            Cli.getInstance().spinner.start();
             await this.configureSettings(settings, false, logger);
             if (!this.verbose) {
                 await logger.logToStderr('');

package/dist/m365/{search/commands/externalconnection/externalconnection-add.js → external/commands/connection/connection-add.js}

@@ -3,23 +3,26 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SearchExternalConnectionAddCommand_instances, _SearchExternalConnectionAddCommand_initTelemetry, _SearchExternalConnectionAddCommand_initOptions, _SearchExternalConnectionAddCommand_initValidators;
+var _ExternalConnectionAddCommand_instances, _ExternalConnectionAddCommand_initTelemetry, _ExternalConnectionAddCommand_initOptions, _ExternalConnectionAddCommand_initValidators;
 import request from '../../../../request.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-class SearchExternalConnectionAddCommand extends GraphCommand {
+class ExternalConnectionAddCommand extends GraphCommand {
     get name() {
-        return commands.EXTERNALCONNECTION_ADD;
+        return commands.CONNECTION_ADD;
     }
     get description() {
-        return 'Adds a new External Connection for Microsoft Search';
+        return 'Adds a new external connection';
+    }
+    alias() {
+        return [commands.EXTERNALCONNECTION_ADD];
     }
     constructor() {
         super();
-        _SearchExternalConnectionAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SearchExternalConnectionAddCommand_instances, "m", _SearchExternalConnectionAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SearchExternalConnectionAddCommand_instances, "m", _SearchExternalConnectionAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SearchExternalConnectionAddCommand_instances, "m", _SearchExternalConnectionAddCommand_initValidators).call(this);
+        _ExternalConnectionAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _ExternalConnectionAddCommand_instances, "m", _ExternalConnectionAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _ExternalConnectionAddCommand_instances, "m", _ExternalConnectionAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _ExternalConnectionAddCommand_instances, "m", _ExternalConnectionAddCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
         let appIds = [];
@@ -51,13 +54,13 @@ class SearchExternalConnectionAddCommand extends GraphCommand {
         }
     }
 }
-_SearchExternalConnectionAddCommand_instances = new WeakSet(), _SearchExternalConnectionAddCommand_initTelemetry = function _SearchExternalConnectionAddCommand_initTelemetry() {
+_ExternalConnectionAddCommand_instances = new WeakSet(), _ExternalConnectionAddCommand_initTelemetry = function _ExternalConnectionAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             authorizedAppIds: typeof args.options.authorizedAppIds !== 'undefined'
         });
     });
-}, _SearchExternalConnectionAddCommand_initOptions = function _SearchExternalConnectionAddCommand_initOptions() {
+}, _ExternalConnectionAddCommand_initOptions = function _ExternalConnectionAddCommand_initOptions() {
     this.options.unshift({
         option: '-i, --id <id>'
     }, {
@@ -67,7 +70,7 @@ _SearchExternalConnectionAddCommand_instances = new WeakSet(), _SearchExternalCo
     }, {
         option: '--authorizedAppIds [authorizedAppIds]'
     });
-}, _SearchExternalConnectionAddCommand_initValidators = function _SearchExternalConnectionAddCommand_initValidators() {
+}, _ExternalConnectionAddCommand_initValidators = function _ExternalConnectionAddCommand_initValidators() {
     this.validators.push(async (args) => {
         const id = args.options.id;
         if (id.length < 3 || id.length > 32) {
@@ -104,5 +107,5 @@ _SearchExternalConnectionAddCommand_instances = new WeakSet(), _SearchExternalCo
         return true;
     });
 };
-export default new SearchExternalConnectionAddCommand();
-//# sourceMappingURL=externalconnection-add.js.map
+export default new ExternalConnectionAddCommand();
+//# sourceMappingURL=connection-add.js.map

package/dist/m365/{search/commands/externalconnection/externalconnection-get.js → external/commands/connection/connection-get.js}

@@ -3,24 +3,27 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SearchExternalConnectionGetCommand_instances, _SearchExternalConnectionGetCommand_initTelemetry, _SearchExternalConnectionGetCommand_initOptions, _SearchExternalConnectionGetCommand_initOptionSets;
+var _ExternalConnectionGetCommand_instances, _ExternalConnectionGetCommand_initTelemetry, _ExternalConnectionGetCommand_initOptions, _ExternalConnectionGetCommand_initOptionSets;
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-class SearchExternalConnectionGetCommand extends GraphCommand {
+class ExternalConnectionGetCommand extends GraphCommand {
     get name() {
-        return commands.EXTERNALCONNECTION_GET;
+        return commands.CONNECTION_GET;
     }
     get description() {
-        return 'Get a specific external connection for use in Microsoft Search';
+        return 'Get a specific external connection';
+    }
+    alias() {
+        return [commands.EXTERNALCONNECTION_GET];
     }
     constructor() {
         super();
-        _SearchExternalConnectionGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SearchExternalConnectionGetCommand_instances, "m", _SearchExternalConnectionGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SearchExternalConnectionGetCommand_instances, "m", _SearchExternalConnectionGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SearchExternalConnectionGetCommand_instances, "m", _SearchExternalConnectionGetCommand_initOptionSets).call(this);
+        _ExternalConnectionGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _ExternalConnectionGetCommand_instances, "m", _ExternalConnectionGetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _ExternalConnectionGetCommand_instances, "m", _ExternalConnectionGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _ExternalConnectionGetCommand_instances, "m", _ExternalConnectionGetCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
         let url = `${this.resource}/v1.0/external/connections`;
@@ -52,21 +55,21 @@ class SearchExternalConnectionGetCommand extends GraphCommand {
         }
     }
 }
-_SearchExternalConnectionGetCommand_instances = new WeakSet(), _SearchExternalConnectionGetCommand_initTelemetry = function _SearchExternalConnectionGetCommand_initTelemetry() {
+_ExternalConnectionGetCommand_instances = new WeakSet(), _ExternalConnectionGetCommand_initTelemetry = function _ExternalConnectionGetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             id: typeof args.options.id !== 'undefined',
             name: typeof args.options.name !== 'undefined'
         });
     });
-}, _SearchExternalConnectionGetCommand_initOptions = function _SearchExternalConnectionGetCommand_initOptions() {
+}, _ExternalConnectionGetCommand_initOptions = function _ExternalConnectionGetCommand_initOptions() {
     this.options.unshift({
         option: '-i, --id [id]'
     }, {
         option: '-n, --name [name]'
     });
-}, _SearchExternalConnectionGetCommand_initOptionSets = function _SearchExternalConnectionGetCommand_initOptionSets() {
+}, _ExternalConnectionGetCommand_initOptionSets = function _ExternalConnectionGetCommand_initOptionSets() {
     this.optionSets.push({ options: ['id', 'name'] });
 };
-export default new SearchExternalConnectionGetCommand();
-//# sourceMappingURL=externalconnection-get.js.map
+export default new ExternalConnectionGetCommand();
+//# sourceMappingURL=connection-get.js.map

package/dist/m365/{search/commands/externalconnection/externalconnection-list.js → external/commands/connection/connection-list.js}

@@ -1,13 +1,16 @@
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-class SearchExternalConnectionListCommand extends GraphCommand {
+class ExternalConnectionListCommand extends GraphCommand {
     get name() {
-        return commands.EXTERNALCONNECTION_LIST;
+        return commands.CONNECTION_LIST;
     }
     get description() {
         return 'Lists external connections defined in the Microsoft Search';
     }
+    alias() {
+        return [commands.EXTERNALCONNECTION_LIST];
+    }
     defaultProperties() {
         return ['id', 'name', 'state'];
     }
@@ -21,5 +24,5 @@ class SearchExternalConnectionListCommand extends GraphCommand {
         }
     }
 }
-export default new SearchExternalConnectionListCommand();
-//# sourceMappingURL=externalconnection-list.js.map
+export default new ExternalConnectionListCommand();
+//# sourceMappingURL=connection-list.js.map

package/dist/m365/{search/commands/externalconnection/externalconnection-remove.js → external/commands/connection/connection-remove.js}

@@ -3,25 +3,28 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SearchExternalConnectionRemoveCommand_instances, _SearchExternalConnectionRemoveCommand_initTelemetry, _SearchExternalConnectionRemoveCommand_initOptions, _SearchExternalConnectionRemoveCommand_initOptionSets;
+var _ExternalConnectionRemoveCommand_instances, _ExternalConnectionRemoveCommand_initTelemetry, _ExternalConnectionRemoveCommand_initOptions, _ExternalConnectionRemoveCommand_initOptionSets;
 import { Cli } from '../../../../cli/Cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-class SearchExternalConnectionRemoveCommand extends GraphCommand {
+class ExternalConnectionRemoveCommand extends GraphCommand {
     get name() {
-        return commands.EXTERNALCONNECTION_REMOVE;
+        return commands.CONNECTION_REMOVE;
     }
     get description() {
-        return 'Removes a specific External Connection from Microsoft Search';
+        return 'Removes a specific external connection';
+    }
+    alias() {
+        return [commands.EXTERNALCONNECTION_REMOVE];
     }
     constructor() {
         super();
-        _SearchExternalConnectionRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SearchExternalConnectionRemoveCommand_instances, "m", _SearchExternalConnectionRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SearchExternalConnectionRemoveCommand_instances, "m", _SearchExternalConnectionRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SearchExternalConnectionRemoveCommand_instances, "m", _SearchExternalConnectionRemoveCommand_initOptionSets).call(this);
+        _ExternalConnectionRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _ExternalConnectionRemoveCommand_instances, "m", _ExternalConnectionRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _ExternalConnectionRemoveCommand_instances, "m", _ExternalConnectionRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _ExternalConnectionRemoveCommand_instances, "m", _ExternalConnectionRemoveCommand_initOptionSets).call(this);
     }
     async getExternalConnectionId(args) {
         if (args.options.id) {
@@ -39,7 +42,7 @@ class SearchExternalConnectionRemoveCommand extends GraphCommand {
             return res.value[0].id;
         }
         if (res.value.length === 0) {
-            throw `The specified connection does not exist in Microsoft Search`;
+            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);
@@ -78,7 +81,7 @@ class SearchExternalConnectionRemoveCommand extends GraphCommand {
         }
     }
 }
-_SearchExternalConnectionRemoveCommand_instances = new WeakSet(), _SearchExternalConnectionRemoveCommand_initTelemetry = function _SearchExternalConnectionRemoveCommand_initTelemetry() {
+_ExternalConnectionRemoveCommand_instances = new WeakSet(), _ExternalConnectionRemoveCommand_initTelemetry = function _ExternalConnectionRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             id: typeof args.options.id !== 'undefined',
@@ -86,10 +89,10 @@ _SearchExternalConnectionRemoveCommand_instances = new WeakSet(), _SearchExterna
             force: (!(!args.options.force)).toString()
         });
     });
-}, _SearchExternalConnectionRemoveCommand_initOptions = function _SearchExternalConnectionRemoveCommand_initOptions() {
+}, _ExternalConnectionRemoveCommand_initOptions = function _ExternalConnectionRemoveCommand_initOptions() {
     this.options.unshift({ option: '--id [id]' }, { option: '--name [name]' }, { option: '-f, --force' });
-}, _SearchExternalConnectionRemoveCommand_initOptionSets = function _SearchExternalConnectionRemoveCommand_initOptionSets() {
+}, _ExternalConnectionRemoveCommand_initOptionSets = function _ExternalConnectionRemoveCommand_initOptionSets() {
     this.optionSets.push({ options: ['id', 'name'] });
 };
-export default new SearchExternalConnectionRemoveCommand();
-//# sourceMappingURL=externalconnection-remove.js.map
+export default new ExternalConnectionRemoveCommand();
+//# sourceMappingURL=connection-remove.js.map

package/dist/m365/{search/commands/externalconnection/externalconnection-schema-add.js → external/commands/connection/connection-schema-add.js}

@@ -3,22 +3,25 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SearchExternalConnectionSchemaAddCommand_instances, _SearchExternalConnectionSchemaAddCommand_initOptions, _SearchExternalConnectionSchemaAddCommand_initValidators;
+var _ExternalConnectionSchemaAddCommand_instances, _ExternalConnectionSchemaAddCommand_initOptions, _ExternalConnectionSchemaAddCommand_initValidators;
 import request from '../../../../request.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-class SearchExternalConnectionSchemaAddCommand extends GraphCommand {
+class ExternalConnectionSchemaAddCommand extends GraphCommand {
     get name() {
-        return commands.EXTERNALCONNECTION_SCHEMA_ADD;
+        return commands.CONNECTION_SCHEMA_ADD;
     }
     get description() {
-        return 'This command allows the administrator to add a schema to a specific external connection for use in Microsoft Search.';
+        return 'Allows the administrator to add a schema to a specific external connection';
+    }
+    alias() {
+        return [commands.EXTERNALCONNECTION_SCHEMA_ADD];
     }
     constructor() {
         super();
-        _SearchExternalConnectionSchemaAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SearchExternalConnectionSchemaAddCommand_instances, "m", _SearchExternalConnectionSchemaAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SearchExternalConnectionSchemaAddCommand_instances, "m", _SearchExternalConnectionSchemaAddCommand_initValidators).call(this);
+        _ExternalConnectionSchemaAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _ExternalConnectionSchemaAddCommand_instances, "m", _ExternalConnectionSchemaAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _ExternalConnectionSchemaAddCommand_instances, "m", _ExternalConnectionSchemaAddCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -40,13 +43,13 @@ class SearchExternalConnectionSchemaAddCommand extends GraphCommand {
         }
     }
 }
-_SearchExternalConnectionSchemaAddCommand_instances = new WeakSet(), _SearchExternalConnectionSchemaAddCommand_initOptions = function _SearchExternalConnectionSchemaAddCommand_initOptions() {
+_ExternalConnectionSchemaAddCommand_instances = new WeakSet(), _ExternalConnectionSchemaAddCommand_initOptions = function _ExternalConnectionSchemaAddCommand_initOptions() {
     this.options.unshift({
         option: '-i, --externalConnectionId <externalConnectionId>'
     }, {
         option: '-s, --schema <schema>'
     });
-}, _SearchExternalConnectionSchemaAddCommand_initValidators = function _SearchExternalConnectionSchemaAddCommand_initValidators() {
+}, _ExternalConnectionSchemaAddCommand_initValidators = function _ExternalConnectionSchemaAddCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.externalConnectionId.length < 3 || args.options.externalConnectionId.length > 32) {
             return 'externalConnectionId must be between 3 and 32 characters in length.';
@@ -69,5 +72,5 @@ _SearchExternalConnectionSchemaAddCommand_instances = new WeakSet(), _SearchExte
         return true;
     });
 };
-export default new SearchExternalConnectionSchemaAddCommand();
-//# sourceMappingURL=externalconnection-schema-add.js.map
+export default new ExternalConnectionSchemaAddCommand();
+//# sourceMappingURL=connection-schema-add.js.map

package/dist/m365/external/commands.js

@@ -0,0 +1,15 @@
+const prefix = 'external';
+const searchPrefix = 'search';
+export default {
+    CONNECTION_ADD: `${prefix} connection add`,
+    CONNECTION_GET: `${prefix} connection get`,
+    CONNECTION_LIST: `${prefix} connection list`,
+    CONNECTION_REMOVE: `${prefix} connection remove`,
+    CONNECTION_SCHEMA_ADD: `${prefix} connection schema add`,
+    EXTERNALCONNECTION_ADD: `${searchPrefix} externalconnection add`,
+    EXTERNALCONNECTION_GET: `${searchPrefix} externalconnection get`,
+    EXTERNALCONNECTION_LIST: `${searchPrefix} externalconnection list`,
+    EXTERNALCONNECTION_REMOVE: `${searchPrefix} externalconnection remove`,
+    EXTERNALCONNECTION_SCHEMA_ADD: `${searchPrefix} externalconnection schema add`
+};
+//# sourceMappingURL=commands.js.map

package/dist/m365/spfx/commands/project/project-doctor/doctor-1.18.1-rc.0.js

@@ -0,0 +1,21 @@
+import { FN001008_DEP_react } from './rules/FN001008_DEP_react.js';
+import { FN001009_DEP_react_dom } from './rules/FN001009_DEP_react_dom.js';
+import { FN001035_DEP_fluentui_react } from './rules/FN001035_DEP_fluentui_react.js';
+import { FN002004_DEVDEP_gulp } from './rules/FN002004_DEVDEP_gulp.js';
+import { FN002007_DEVDEP_ajv } from './rules/FN002007_DEVDEP_ajv.js';
+import { FN002013_DEVDEP_types_webpack_env } from './rules/FN002013_DEVDEP_types_webpack_env.js';
+import { FN002015_DEVDEP_types_react } from './rules/FN002015_DEVDEP_types_react.js';
+import { FN002016_DEVDEP_types_react_dom } from './rules/FN002016_DEVDEP_types_react_dom.js';
+import { FN002019_DEVDEP_microsoft_rush_stack_compiler } from './rules/FN002019_DEVDEP_microsoft_rush_stack_compiler.js';
+export default [
+    new FN001008_DEP_react('17'),
+    new FN001009_DEP_react_dom('17'),
+    new FN001035_DEP_fluentui_react('^8.106.4'),
+    new FN002004_DEVDEP_gulp('4.0.2'),
+    new FN002007_DEVDEP_ajv('^6.12.5'),
+    new FN002013_DEVDEP_types_webpack_env('~1.15.2'),
+    new FN002015_DEVDEP_types_react('17'),
+    new FN002016_DEVDEP_types_react_dom('17'),
+    new FN002019_DEVDEP_microsoft_rush_stack_compiler(['4.7'])
+];
+//# sourceMappingURL=doctor-1.18.1-rc.0.js.map

package/dist/m365/spfx/commands/project/project-doctor.js

@@ -67,7 +67,8 @@ class SpfxProjectDoctorCommand extends BaseProjectCommand {
             '1.17.2',
             '1.17.3',
             '1.17.4',
-            '1.18.0'
+            '1.18.0',
+            '1.18.1-rc.0'
         ];
         __classPrivateFieldGet(this, _SpfxProjectDoctorCommand_instances, "m", _SpfxProjectDoctorCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpfxProjectDoctorCommand_instances, "m", _SpfxProjectDoctorCommand_initOptions).call(this);