@pnp/cli-microsoft365 7.0.0-beta.093ef31 → 7.0.0-beta.18ce559

package/dist/m365/spo/commands/applicationcustomizer/applicationcustomizer-set.js

@@ -10,7 +10,7 @@ import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
 import { spo } from '../../../../utils/spo.js';
 import { formatting } from '../../../../utils/formatting.js';
-import os from 'os';
+import { Cli } from '../../../../cli/Cli.js';
 class SpoApplicationCustomizerSetCommand extends SpoCommand {
     get name() {
         return commands.APPLICATIONCUSTOMIZER_SET;
@@ -82,7 +82,8 @@ class SpoApplicationCustomizerSetCommand extends SpoCommand {
             throw `No application customizer with ${title && `title '${title}'` || clientSideComponentId && `ClientSideComponentId '${clientSideComponentId}'` || id && `id '${id}'`} found`;
         }
         if (appCustomizers.length > 1) {
-            throw `Multiple application customizer with ${title ? `title '${title}'` : `ClientSideComponentId '${clientSideComponentId}'`} found. Please disambiguate using IDs: ${os.EOL}${appCustomizers.map(a => `- ${a.Id}`).join(os.EOL)}`;
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('Id', appCustomizers);
+            return await Cli.handleMultipleResultsFound(`Multiple application customizer with ${title ? `title '${title}'` : `ClientSideComponentId '${clientSideComponentId}'`} found.`, resultAsKeyValuePair);
         }
         return appCustomizers[0];
     }

package/dist/m365/spo/commands/commandset/commandset-get.js

@@ -4,12 +4,12 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoCommandSetGetCommand_instances, _a, _SpoCommandSetGetCommand_initTelemetry, _SpoCommandSetGetCommand_initOptions, _SpoCommandSetGetCommand_initValidators, _SpoCommandSetGetCommand_initOptionSets;
-import os from 'os';
 import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+import { Cli } from '../../../../cli/Cli.js';
 class SpoCommandSetGetCommand extends SpoCommand {
     get name() {
         return commands.COMMANDSET_GET;
@@ -58,7 +58,9 @@ class SpoCommandSetGetCommand extends SpoCommand {
                     throw `No command set with title '${args.options.title}' found.`;
                 }
                 else {
-                    throw `Multiple command sets with title '${args.options.title}' found. Please disambiguate using IDs: ${os.EOL}${commandSets.map(commandSet => `- ${commandSet.Id}`).join(os.EOL)}.`;
+                    const resultAsKeyValuePair = formatting.convertArrayToHashTable('Id', commandSets);
+                    const commandSet = await Cli.handleMultipleResultsFound(`Multiple command sets with title '${args.options.title}' found.`, resultAsKeyValuePair);
+                    logger.log(commandSet);
                 }
             }
         }

package/dist/m365/spo/commands/commandset/commandset-remove.js

@@ -63,7 +63,8 @@ class SpoCommandSetRemoveCommand extends SpoCommand {
             throw `No user commandsets with ${options.title && `title '${options.title}'` || options.clientSideComponentId && `ClientSideComponentId '${options.clientSideComponentId}'` || options.id && `id '${options.id}'`} found`;
         }
         if (commandSets.length > 1) {
-            throw `Multiple user commandsets with ${options.title ? `title '${options.title}'` : `ClientSideComponentId '${options.clientSideComponentId}'`} found. Please disambiguate using IDs: ${commandSets.map((commandSet) => commandSet.Id).join(', ')}`;
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('Id', commandSets);
+            return await Cli.handleMultipleResultsFound(`Multiple user commandsets with ${options.title ? `title '${options.title}'` : `ClientSideComponentId '${options.clientSideComponentId}'`} found.`, resultAsKeyValuePair);
         }
         return commandSets[0];
     }

package/dist/m365/spo/commands/commandset/commandset-set.js

@@ -10,6 +10,7 @@ import SpoCommand from '../../../base/SpoCommand.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
+import { Cli } from '../../../../cli/Cli.js';
 class SpoCommandSetSetCommand extends SpoCommand {
     get name() {
         return commands.COMMANDSET_SET;
@@ -84,7 +85,8 @@ class SpoCommandSetSetCommand extends SpoCommand {
             throw `No user commandsets with ${options.title && `title '${options.title}'` || options.clientSideComponentId && `ClientSideComponentId '${options.clientSideComponentId}'` || options.id && `id '${options.id}'`} found`;
         }
         if (commandSets.length > 1) {
-            throw `Multiple user commandsets with ${options.title ? `title '${options.title}'` : `ClientSideComponentId '${options.clientSideComponentId}'`} found. Please disambiguate using IDs: ${commandSets.map((commandSet) => commandSet.Id).join(', ')}`;
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('Id', commandSets);
+            return await Cli.handleMultipleResultsFound(`Multiple user commandsets with ${options.title ? `title '${options.title}'` : `ClientSideComponentId '${options.clientSideComponentId}'`} found.`, resultAsKeyValuePair);
         }
         return commandSets[0];
     }

package/dist/m365/spo/commands/customaction/customaction-get.js

@@ -4,6 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoCustomActionGetCommand_instances, _SpoCustomActionGetCommand_initTelemetry, _SpoCustomActionGetCommand_initOptions, _SpoCustomActionGetCommand_initValidators, _SpoCustomActionGetCommand_initOptionSets;
+import { Cli } from '../../../../cli/Cli.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
@@ -71,7 +72,8 @@ class SpoCustomActionGetCommand extends SpoCommand {
             if (customActions.length === 0) {
                 throw `No user custom action with title '${options.title}' found`;
             }
-            throw `Multiple user custom actions with title '${options.title}' found. Please disambiguate using IDs: ${customActions.map(a => a.Id).join(', ')}`;
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('Id', customActions);
+            return await Cli.handleMultipleResultsFound(`Multiple user custom actions with title '${options.title}' found.`, resultAsKeyValuePair);
         }
         else {
             const customActions = await spo.getCustomActions(options.webUrl, options.scope, `ClientSideComponentId eq guid'${options.clientSideComponentId}'`);
@@ -79,7 +81,8 @@ class SpoCustomActionGetCommand extends SpoCommand {
                 throw `No user custom action with ClientSideComponentId '${options.clientSideComponentId}' found`;
             }
             if (customActions.length > 1) {
-                throw `Multiple user custom actions with ClientSideComponentId '${options.clientSideComponentId}' found. Please disambiguate using IDs: ${customActions.map((customAction) => customAction.Id).join(', ')}`;
+                const resultAsKeyValuePair = formatting.convertArrayToHashTable('Id', customActions);
+                return await Cli.handleMultipleResultsFound(`Multiple user custom actions with ClientSideComponentId '${options.clientSideComponentId}' found.`, resultAsKeyValuePair);
             }
             return customActions[0];
         }

package/dist/m365/spo/commands/customaction/customaction-remove.js

@@ -72,7 +72,9 @@ class SpoCustomActionRemoveCommand extends SpoCommand {
         if (customActions.length === 0) {
             throw `No user custom action with title '${options.title}' found`;
         }
-        throw `Multiple user custom actions with title '${options.title}' found. Please disambiguate using IDs: ${customActions.map(a => a.Id).join(', ')}`;
+        const resultAsKeyValuePair = formatting.convertArrayToHashTable('Id', customActions);
+        const result = await Cli.handleMultipleResultsFound(`Multiple user custom actions with title '${options.title}' found.`, resultAsKeyValuePair);
+        return result.Id;
     }
     async removeScopedCustomAction(options) {
         const customActionId = await this.getCustomActionId(options);

package/dist/m365/spo/commands/eventreceiver/eventreceiver-get.js

@@ -4,6 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoEventreceiverGetCommand_instances, _SpoEventreceiverGetCommand_initTelemetry, _SpoEventreceiverGetCommand_initOptions, _SpoEventreceiverGetCommand_initValidators, _SpoEventreceiverGetCommand_initOptionSets;
+import { Cli } from '../../../../cli/Cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
@@ -75,7 +76,8 @@ class SpoEventreceiverGetCommand extends SpoCommand {
                 throw `The specified event receiver '${args.options.name}' does not exist.`;
             }
             if (res.value && res.value.length > 1) {
-                throw `Multiple event receivers with name '${args.options.name}' found: ${res.value.map(x => x.ReceiverId)}`;
+                const resultAsKeyValuePair = formatting.convertArrayToHashTable('ReceiverId', res.value);
+                return await Cli.handleMultipleResultsFound(`Multiple event receivers with name '${args.options.name}' found.`, resultAsKeyValuePair);
             }
             return res.value[0];
         }

package/dist/m365/spo/commands/file/file-get.js

@@ -103,6 +103,9 @@ class SpoFileGetCommand extends SpoCommand {
                             fileProperties.ListItemAllFields.RoleAssignments = response.value;
                         }
                     }
+                    if (args.options.asListItem) {
+                        delete fileProperties.ListItemAllFields.ID;
+                    }
                     await logger.log(args.options.asListItem ? fileProperties.ListItemAllFields : fileProperties);
                 }
             }
@@ -115,20 +118,20 @@ class SpoFileGetCommand extends SpoCommand {
 _SpoFileGetCommand_instances = new WeakSet(), _SpoFileGetCommand_initTelemetry = function _SpoFileGetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            id: (!(!args.options.id)).toString(),
-            url: (!(!args.options.url)).toString(),
-            asString: args.options.asString || false,
-            asListItem: args.options.asListItem || false,
-            asFile: args.options.asFile || false,
-            path: (!(!args.options.path)).toString(),
+            id: typeof args.options.id !== 'undefined',
+            url: typeof args.options.url !== 'undefined',
+            asString: !!args.options.asString,
+            asListItem: !!args.options.asListItem,
+            asFile: !!args.options.asFile,
+            path: typeof args.options.path !== 'undefined',
             withPermissions: !!args.options.withPermissions
         });
     });
 }, _SpoFileGetCommand_initOptions = function _SpoFileGetCommand_initOptions() {
     this.options.unshift({
-        option: '-w, --webUrl <webUrl>'
+        option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-u, --url [url]'
+        option: '--url [url]'
     }, {
         option: '-i, --id [id]'
     }, {

package/dist/m365/spo/commands/file/file-remove.js

@@ -92,11 +92,11 @@ _SpoFileRemoveCommand_instances = new WeakSet(), _SpoFileRemoveCommand_initTelem
     });
 }, _SpoFileRemoveCommand_initOptions = function _SpoFileRemoveCommand_initOptions() {
     this.options.unshift({
-        option: '-w, --webUrl <webUrl>'
+        option: '-u, --webUrl <webUrl>'
     }, {
         option: '-i, --id [id]'
     }, {
-        option: '-u, --url [url]'
+        option: '--url [url]'
     }, {
         option: '--recycle'
     }, {

package/dist/m365/spo/commands/file/file-version-clear.js

@@ -79,9 +79,9 @@ _SpoFileVersionClearCommand_instances = new WeakSet(), _SpoFileVersionClearComma
     });
 }, _SpoFileVersionClearCommand_initOptions = function _SpoFileVersionClearCommand_initOptions() {
     this.options.unshift({
-        option: '-w, --webUrl <webUrl>'
+        option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-u, --fileUrl [fileUrl]'
+        option: '--fileUrl [fileUrl]'
     }, {
         option: '-i, --fileId [fileId]'
     }, {

package/dist/m365/spo/commands/file/file-version-get.js

@@ -67,11 +67,11 @@ _SpoFileVersionGetCommand_instances = new WeakSet(), _SpoFileVersionGetCommand_i
     });
 }, _SpoFileVersionGetCommand_initOptions = function _SpoFileVersionGetCommand_initOptions() {
     this.options.unshift({
-        option: '-w, --webUrl <webUrl>'
+        option: '-u, --webUrl <webUrl>'
     }, {
         option: '--label <label>'
     }, {
-        option: '-u, --fileUrl [fileUrl]'
+        option: '--fileUrl [fileUrl]'
     }, {
         option: '-i, --fileId [fileId]'
     });

package/dist/m365/spo/commands/file/file-version-list.js

@@ -59,9 +59,9 @@ _SpoFileVersionListCommand_instances = new WeakSet(), _SpoFileVersionListCommand
     });
 }, _SpoFileVersionListCommand_initOptions = function _SpoFileVersionListCommand_initOptions() {
     this.options.unshift({
-        option: '-w, --webUrl <webUrl>'
+        option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-u, --fileUrl [fileUrl]'
+        option: '--fileUrl [fileUrl]'
     }, {
         option: '-i, --fileId [fileId]'
     });

package/dist/m365/spo/commands/file/file-version-remove.js

@@ -80,11 +80,11 @@ _SpoFileVersionRemoveCommand_instances = new WeakSet(), _SpoFileVersionRemoveCom
     });
 }, _SpoFileVersionRemoveCommand_initOptions = function _SpoFileVersionRemoveCommand_initOptions() {
     this.options.unshift({
-        option: '-w, --webUrl <webUrl>'
+        option: '-u, --webUrl <webUrl>'
     }, {
         option: '--label <label>'
     }, {
-        option: '-u, --fileUrl [fileUrl]'
+        option: '--fileUrl [fileUrl]'
     }, {
         option: '-i, --fileId [fileId]'
     }, {

package/dist/m365/spo/commands/file/file-version-restore.js

@@ -80,11 +80,11 @@ _SpoFileVersionRestoreCommand_instances = new WeakSet(), _SpoFileVersionRestoreC
     });
 }, _SpoFileVersionRestoreCommand_initOptions = function _SpoFileVersionRestoreCommand_initOptions() {
     this.options.unshift({
-        option: '-w, --webUrl <webUrl>'
+        option: '-u, --webUrl <webUrl>'
     }, {
         option: '--label <label>'
     }, {
-        option: '-u, --fileUrl [fileUrl]'
+        option: '--fileUrl [fileUrl]'
     }, {
         option: '-i, --fileId [fileId]'
     }, {

package/dist/m365/spo/commands/group/group-member-add.js

@@ -82,24 +82,24 @@ class SpoGroupMemberAddCommand extends SpoCommand {
             await logger.logToStderr('Checking if the specified users and groups exist');
         }
         const validUserNames = [];
-        const identifiers = args.options.userName ?? args.options.email ?? args.options.aadGroupId ?? args.options.aadGroupName ?? args.options.userId.toString();
+        const identifiers = args.options.userNames ?? args.options.emails ?? args.options.aadGroupIds ?? args.options.aadGroupNames ?? args.options.userIds.toString();
         await Promise.all(identifiers.split(',').map(async (identifier) => {
             const trimmedIdentifier = identifier.trim();
             try {
-                if (args.options.userId) {
+                if (args.options.userIds) {
                     if (this.verbose) {
                         await logger.logToStderr(`Getting AAD ID of user with ID ${trimmedIdentifier}`);
                     }
                     const spoUserAzureId = await spo.getUserAzureIdBySpoId(args.options.webUrl, trimmedIdentifier);
                     validUserNames.push(spoUserAzureId);
                 }
-                else if (args.options.userName) {
+                else if (args.options.userNames) {
                     validUserNames.push(trimmedIdentifier);
                 }
-                else if (args.options.aadGroupId) {
+                else if (args.options.aadGroupIds) {
                     validUserNames.push(trimmedIdentifier);
                 }
-                else if (args.options.aadGroupName) {
+                else if (args.options.aadGroupNames) {
                     if (this.verbose) {
                         await logger.logToStderr(`Getting ID of Azure AD group ${trimmedIdentifier}`);
                     }
@@ -132,11 +132,11 @@ _SpoGroupMemberAddCommand_instances = new WeakSet(), _SpoGroupMemberAddCommand_i
         Object.assign(this.telemetryProperties, {
             groupId: typeof args.options.groupId !== 'undefined',
             groupName: typeof args.options.groupName !== 'undefined',
-            userName: typeof args.options.userName !== 'undefined',
-            email: typeof args.options.email !== 'undefined',
-            userId: typeof args.options.userId !== 'undefined',
-            aadGroupId: typeof args.options.aadGroupId !== 'undefined',
-            aadGroupName: typeof args.options.aadGroupName !== 'undefined'
+            userNames: typeof args.options.userNames !== 'undefined',
+            emails: typeof args.options.emails !== 'undefined',
+            userIds: typeof args.options.userIds !== 'undefined',
+            aadGroupIds: typeof args.options.aadGroupIds !== 'undefined',
+            aadGroupNames: typeof args.options.aadGroupNames !== 'undefined'
         });
     });
 }, _SpoGroupMemberAddCommand_initOptions = function _SpoGroupMemberAddCommand_initOptions() {
@@ -147,15 +147,15 @@ _SpoGroupMemberAddCommand_instances = new WeakSet(), _SpoGroupMemberAddCommand_i
     }, {
         option: '--groupName [groupName]'
     }, {
-        option: '--userName [userName]'
+        option: '--userNames [userNames]'
     }, {
-        option: '--email [email]'
+        option: '--emails [emails]'
     }, {
-        option: '--userId [userId]'
+        option: '--userIds [userIds]'
     }, {
-        option: '--aadGroupId [aadGroupId]'
+        option: '--aadGroupIds [aadGroupIds]'
     }, {
-        option: '--aadGroupName [aadGroupName]'
+        option: '--aadGroupNames [aadGroupNames]'
     });
 }, _SpoGroupMemberAddCommand_initValidators = function _SpoGroupMemberAddCommand_initValidators() {
     this.validators.push(async (args) => {
@@ -167,22 +167,22 @@ _SpoGroupMemberAddCommand_instances = new WeakSet(), _SpoGroupMemberAddCommand_i
             return `Specified groupId ${args.options.groupId} is not a number`;
         }
         const userIdReg = new RegExp(/^[0-9,]*$/);
-        if (args.options.userId && !userIdReg.test(args.options.userId)) {
-            return `${args.options.userId} is not a number or a comma seperated value`;
+        if (args.options.userIds && !userIdReg.test(args.options.userIds)) {
+            return `${args.options.userIds} is not a number or a comma separated value`;
         }
-        if (args.options.userName && args.options.userName.split(',').some(e => !validation.isValidUserPrincipalName(e))) {
-            return `${args.options.userName} contains one or more invalid usernames`;
+        if (args.options.userNames && args.options.userNames.split(',').some(e => !validation.isValidUserPrincipalName(e))) {
+            return `${args.options.userNames} contains one or more invalid usernames`;
         }
-        if (args.options.email && args.options.email.split(',').some(e => !validation.isValidUserPrincipalName(e))) {
-            return `${args.options.email} contains one or more invalid email addresses`;
+        if (args.options.emails && args.options.emails.split(',').some(e => !validation.isValidUserPrincipalName(e))) {
+            return `${args.options.emails} contains one or more invalid email addresses`;
         }
-        if (args.options.aadGroupId && args.options.aadGroupId.split(',').some(e => !validation.isValidGuid(e))) {
-            return `${args.options.aadGroupId} contains one or more invalid GUIDs`;
+        if (args.options.aadGroupIds && args.options.aadGroupIds.split(',').some(e => !validation.isValidGuid(e))) {
+            return `${args.options.aadGroupIds} contains one or more invalid GUIDs`;
         }
         return true;
     });
 }, _SpoGroupMemberAddCommand_initOptionSets = function _SpoGroupMemberAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['groupId', 'groupName'] }, { options: ['userName', 'email', 'userId', 'aadGroupId', 'aadGroupName'] });
+    this.optionSets.push({ options: ['groupId', 'groupName'] }, { options: ['userNames', 'emails', 'userIds', 'aadGroupIds', 'aadGroupNames'] });
 };
 export default new SpoGroupMemberAddCommand();
 //# sourceMappingURL=group-member-add.js.map

package/dist/m365/spo/commands/hubsite/hubsite-connect.js

@@ -9,6 +9,8 @@ import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+import { Cli } from '../../../../cli/Cli.js';
+import { formatting } from '../../../../utils/formatting.js';
 class SpoHubSiteConnectCommand extends SpoCommand {
     get name() {
         return commands.HUBSITE_CONNECT;
@@ -31,8 +33,8 @@ class SpoHubSiteConnectCommand extends SpoCommand {
         try {
             const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
             const hubSites = await this.getHubSites(spoAdminUrl);
-            const hubSite = this.getSpecificHubSite(hubSites, args.options.id, args.options.title, args.options.url);
-            const parentHubSite = this.getSpecificHubSite(hubSites, args.options.parentId, args.options.parentTitle, args.options.parentUrl);
+            const hubSite = await this.getSpecificHubSite(hubSites, args.options.id, args.options.title, args.options.url);
+            const parentHubSite = await this.getSpecificHubSite(hubSites, args.options.parentId, args.options.parentTitle, args.options.parentUrl);
             const requestOptions = {
                 url: `${spoAdminUrl}/_api/HubSites/GetById('${hubSite.ID}')`,
                 headers: {
@@ -61,7 +63,7 @@ class SpoHubSiteConnectCommand extends SpoCommand {
         const hubSites = await request.get(requestOptions);
         return hubSites.value;
     }
-    getSpecificHubSite(hubSites, id, title, url) {
+    async getSpecificHubSite(hubSites, id, title, url) {
         let filteredHubSites = [];
         if (id) {
             filteredHubSites = hubSites.filter(site => site.ID.toLowerCase() === id.toLowerCase());
@@ -76,7 +78,8 @@ class SpoHubSiteConnectCommand extends SpoCommand {
             throw `The specified hub site '${id || title || url}' does not exist.`;
         }
         if (filteredHubSites.length > 1) {
-            throw `Multiple hub sites with name '${title}' found: ${filteredHubSites.map(s => s.ID).join(',')}.`;
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('ID', filteredHubSites);
+            return await Cli.handleMultipleResultsFound(`Multiple hub sites with name '${title}' found.`, resultAsKeyValuePair);
         }
         return filteredHubSites[0];
     }

package/dist/m365/spo/commands/hubsite/hubsite-disconnect.js

@@ -6,6 +6,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoHubSiteDisconnectCommand_instances, _SpoHubSiteDisconnectCommand_initTelemetry, _SpoHubSiteDisconnectCommand_initOptions, _SpoHubSiteDisconnectCommand_initOptionSets, _SpoHubSiteDisconnectCommand_initValidators;
 import { Cli } from '../../../../cli/Cli.js';
 import request from '../../../../request.js';
+import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -91,7 +92,9 @@ class SpoHubSiteDisconnectCommand extends SpoCommand {
             throw `The specified hub site '${options.title || options.url}' does not exist.`;
         }
         if (filteredHubSites.length > 1) {
-            throw `Multiple hub sites with name '${options.title}' found: ${filteredHubSites.map(s => s.ID).join(',')}.`;
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('ID', filteredHubSites);
+            const result = await Cli.handleMultipleResultsFound(`Multiple hub sites with name '${options.title}' found.`, resultAsKeyValuePair);
+            return result;
         }
         return filteredHubSites[0];
     }

package/dist/m365/spo/commands/hubsite/hubsite-get.js

@@ -6,6 +6,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoHubSiteGetCommand_instances, _SpoHubSiteGetCommand_initTelemetry, _SpoHubSiteGetCommand_initOptions, _SpoHubSiteGetCommand_initValidators, _SpoHubSiteGetCommand_initOptionSets;
 import { Cli } from '../../../../cli/Cli.js';
 import request from '../../../../request.js';
+import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -87,7 +88,8 @@ class SpoHubSiteGetCommand extends SpoCommand {
             throw `The specified hub site ${options.title || options.url} does not exist`;
         }
         if (hubSites.length > 1) {
-            throw `Multiple hub sites with ${options.title || options.url} found. Please disambiguate: ${hubSites.map(site => site.SiteUrl).join(', ')}`;
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('ID', hubSites);
+            return await Cli.handleMultipleResultsFound(`Multiple hub sites with ${options.title || options.url} found.`, resultAsKeyValuePair);
         }
         return hubSites[0];
     }

package/dist/m365/spo/commands/listitem/listitem-add.js

@@ -148,6 +148,7 @@ class SpoListItemAddCommand extends SpoCommand {
                 responseType: 'json'
             };
             const item = await request.get(requestOptions);
+            delete item.ID;
             await logger.log(item);
         }
         catch (err) {

package/dist/m365/spo/commands/listitem/listitem-attachment-add.js

@@ -0,0 +1,127 @@
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    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 _SpoListItemAttachmentAddCommand_instances, _SpoListItemAttachmentAddCommand_initTelemetry, _SpoListItemAttachmentAddCommand_initOptions, _SpoListItemAttachmentAddCommand_initValidators, _SpoListItemAttachmentAddCommand_initOptionSets;
+import request from '../../../../request.js';
+import { formatting } from '../../../../utils/formatting.js';
+import { urlUtil } from '../../../../utils/urlUtil.js';
+import { validation } from '../../../../utils/validation.js';
+import SpoCommand from '../../../base/SpoCommand.js';
+import commands from '../../commands.js';
+import fs from 'fs';
+class SpoListItemAttachmentAddCommand extends SpoCommand {
+    get name() {
+        return commands.LISTITEM_ATTACHMENT_ADD;
+    }
+    get description() {
+        return 'Adds an attachment to a list item';
+    }
+    constructor() {
+        super();
+        _SpoListItemAttachmentAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoListItemAttachmentAddCommand_instances, "m", _SpoListItemAttachmentAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoListItemAttachmentAddCommand_instances, "m", _SpoListItemAttachmentAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoListItemAttachmentAddCommand_instances, "m", _SpoListItemAttachmentAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoListItemAttachmentAddCommand_instances, "m", _SpoListItemAttachmentAddCommand_initOptionSets).call(this);
+    }
+    async commandAction(logger, args) {
+        if (this.verbose) {
+            await logger.logToStderr(`Adding an attachment to list item with id ${args.options.listItemId} on list ${args.options.listId || args.options.listTitle || args.options.listUrl} on web ${args.options.webUrl}.`);
+        }
+        try {
+            const fileName = this.getFileName(args.options.filePath, args.options.fileName);
+            const fileBody = fs.readFileSync(args.options.filePath);
+            const requestOptions = {
+                url: `${args.options.webUrl}/_api/web/${this.getListUrl(args.options.webUrl, args.options.listId, args.options.listTitle, args.options.listUrl)}/items(${args.options.listItemId})/AttachmentFiles/add(FileName='${fileName}')`,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                data: fileBody,
+                responseType: 'json'
+            };
+            const response = await request.post(requestOptions);
+            await logger.log(response);
+        }
+        catch (err) {
+            if (err.error &&
+                err.error['odata.error'] &&
+                err.error['odata.error'].message && err.error['odata.error'].message.value.indexOf('The document or folder name was not changed.') > -1) {
+                this.handleError(err.error['odata.error'].message.value.split('\n')[0]);
+            }
+            else {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        }
+    }
+    getFileName(filePath, fileName) {
+        if (!fileName) {
+            return filePath.replace(/^.*[\\\/]/, '');
+        }
+        const extension = filePath.split('.').pop();
+        if (!fileName.endsWith(`.${extension}`)) {
+            fileName += `.${extension}`;
+        }
+        return fileName;
+    }
+    getListUrl(webUrl, listId, listTitle, listUrl) {
+        if (listId) {
+            return `lists(guid'${formatting.encodeQueryParameter(listId)}')`;
+        }
+        else if (listTitle) {
+            return `lists/getByTitle('${formatting.encodeQueryParameter(listTitle)}')`;
+        }
+        else {
+            const listServerRelativeUrl = urlUtil.getServerRelativePath(webUrl, listUrl);
+            return `GetList('${formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
+        }
+    }
+}
+_SpoListItemAttachmentAddCommand_instances = new WeakSet(), _SpoListItemAttachmentAddCommand_initTelemetry = function _SpoListItemAttachmentAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            listId: typeof args.options.listId !== 'undefined',
+            listTitle: typeof args.options.listTitle !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined',
+            fileName: typeof args.options.fileName !== 'undefined'
+        });
+    });
+}, _SpoListItemAttachmentAddCommand_initOptions = function _SpoListItemAttachmentAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '--listId [listId]'
+    }, {
+        option: '--listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
+    }, {
+        option: '--listItemId <listItemId>'
+    }, {
+        option: '-p, --filePath <filePath>'
+    }, {
+        option: '-n, --fileName [fileName]'
+    });
+}, _SpoListItemAttachmentAddCommand_initValidators = function _SpoListItemAttachmentAddCommand_initValidators() {
+    this.validators.push(async (args) => {
+        const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
+        if (isValidSharePointUrl !== true) {
+            return isValidSharePointUrl;
+        }
+        if (isNaN(args.options.listItemId)) {
+            return `${args.options.listItemId} in option listItemId is not a valid number.`;
+        }
+        if (args.options.listId && !validation.isValidGuid(args.options.listId)) {
+            return `${args.options.listId} in option listId is not a valid GUID.`;
+        }
+        if (!fs.existsSync(args.options.filePath)) {
+            return `File with path '${args.options.filePath}' was not found.`;
+        }
+        return true;
+    });
+}, _SpoListItemAttachmentAddCommand_initOptionSets = function _SpoListItemAttachmentAddCommand_initOptionSets() {
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
+};
+export default new SpoListItemAttachmentAddCommand();
+//# sourceMappingURL=listitem-attachment-add.js.map