@pnp/cli-microsoft365 7.0.0-beta.f1037e1 → 7.0.0

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

@@ -3,7 +3,7 @@ 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 _SpoApplicationCustomizerListCommand_instances, _SpoApplicationCustomizerListCommand_initOptions, _SpoApplicationCustomizerListCommand_initTelemetry, _SpoApplicationCustomizerListCommand_initValidators;
+var _SpoApplicationCustomizerListCommand_instances, _a, _SpoApplicationCustomizerListCommand_initOptions, _SpoApplicationCustomizerListCommand_initTelemetry, _SpoApplicationCustomizerListCommand_initValidators;
 import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -33,12 +33,12 @@ class SpoApplicationCustomizerListCommand extends SpoCommand {
         await logger.log(applicationCustomizers);
     }
 }
-_SpoApplicationCustomizerListCommand_instances = new WeakSet(), _SpoApplicationCustomizerListCommand_initOptions = function _SpoApplicationCustomizerListCommand_initOptions() {
+_a = SpoApplicationCustomizerListCommand, _SpoApplicationCustomizerListCommand_instances = new WeakSet(), _SpoApplicationCustomizerListCommand_initOptions = function _SpoApplicationCustomizerListCommand_initOptions() {
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
         option: '-s, --scope [scope]',
-        autocomplete: SpoApplicationCustomizerListCommand.scopes
+        autocomplete: _a.scopes
     });
 }, _SpoApplicationCustomizerListCommand_initTelemetry = function _SpoApplicationCustomizerListCommand_initTelemetry() {
     this.telemetry.push((args) => {
@@ -48,8 +48,8 @@ _SpoApplicationCustomizerListCommand_instances = new WeakSet(), _SpoApplicationC
     });
 }, _SpoApplicationCustomizerListCommand_initValidators = function _SpoApplicationCustomizerListCommand_initValidators() {
     this.validators.push(async (args) => {
-        if (args.options.scope && SpoApplicationCustomizerListCommand.scopes.indexOf(args.options.scope) < 0) {
-            return `${args.options.scope} is not a valid scope. Allowed values are ${SpoApplicationCustomizerListCommand.scopes.join(', ')}`;
+        if (args.options.scope && _a.scopes.indexOf(args.options.scope) < 0) {
+            return `${args.options.scope} is not a valid scope. Allowed values are ${_a.scopes.join(', ')}`;
         }
         return validation.isValidSharePointUrl(args.options.webUrl);
     });

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

@@ -11,7 +11,6 @@ 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';
 class SpoApplicationCustomizerRemoveCommand extends SpoCommand {
     get name() {
         return commands.APPLICATIONCUSTOMIZER_REMOVE;
@@ -80,7 +79,8 @@ class SpoApplicationCustomizerRemoveCommand extends SpoCommand {
             throw `No application customizer with ${options.title && `title '${options.title}'` || options.clientSideComponentId && `ClientSideComponentId '${options.clientSideComponentId}'` || options.id && `id '${options.id}'`} found`;
         }
         if (appCustomizers.length > 1) {
-            throw `Multiple application customizer with ${options.title ? `title '${options.title}'` : `ClientSideComponentId '${options.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 ${options.title ? `title '${options.title}'` : `ClientSideComponentId '${options.clientSideComponentId}'`} found.`, resultAsKeyValuePair);
         }
         return appCustomizers[0];
     }

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-add.js

@@ -3,7 +3,7 @@ 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 _SpoCommandSetAddCommand_instances, _SpoCommandSetAddCommand_initTelemetry, _SpoCommandSetAddCommand_initOptions, _SpoCommandSetAddCommand_initValidators;
+var _SpoCommandSetAddCommand_instances, _a, _SpoCommandSetAddCommand_initTelemetry, _SpoCommandSetAddCommand_initOptions, _SpoCommandSetAddCommand_initValidators;
 import commands from '../../commands.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -78,7 +78,7 @@ class SpoCommandSetAddCommand extends SpoCommand {
         }
     }
 }
-_SpoCommandSetAddCommand_instances = new WeakSet(), _SpoCommandSetAddCommand_initTelemetry = function _SpoCommandSetAddCommand_initTelemetry() {
+_a = SpoCommandSetAddCommand, _SpoCommandSetAddCommand_instances = new WeakSet(), _SpoCommandSetAddCommand_initTelemetry = function _SpoCommandSetAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             clientSideComponentProperties: typeof args.options.clientSideComponentProperties !== 'undefined',
@@ -92,29 +92,29 @@ _SpoCommandSetAddCommand_instances = new WeakSet(), _SpoCommandSetAddCommand_ini
     }, {
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-l, --listType <listType>', autocomplete: SpoCommandSetAddCommand.listTypes
+        option: '-l, --listType <listType>', autocomplete: _a.listTypes
     }, {
         option: '-i, --clientSideComponentId  <clientSideComponentId>'
     }, {
         option: '--clientSideComponentProperties  [clientSideComponentProperties]'
     }, {
-        option: '-s, --scope [scope]', autocomplete: SpoCommandSetAddCommand.scopes
+        option: '-s, --scope [scope]', autocomplete: _a.scopes
     }, {
-        option: '--location [location]', autocomplete: SpoCommandSetAddCommand.locations
+        option: '--location [location]', autocomplete: _a.locations
     });
 }, _SpoCommandSetAddCommand_initValidators = function _SpoCommandSetAddCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.clientSideComponentId && !validation.isValidGuid(args.options.clientSideComponentId)) {
             return `${args.options.clientSideComponentId} is not a valid GUID`;
         }
-        if (SpoCommandSetAddCommand.listTypes.indexOf(args.options.listType) < 0) {
-            return `${args.options.listType} is not a valid list type. Allowed values are ${SpoCommandSetAddCommand.listTypes.join(', ')}`;
+        if (_a.listTypes.indexOf(args.options.listType) < 0) {
+            return `${args.options.listType} is not a valid list type. Allowed values are ${_a.listTypes.join(', ')}`;
         }
-        if (args.options.scope && SpoCommandSetAddCommand.scopes.indexOf(args.options.scope) < 0) {
-            return `${args.options.scope} is not a valid scope. Allowed values are ${SpoCommandSetAddCommand.scopes.join(', ')}`;
+        if (args.options.scope && _a.scopes.indexOf(args.options.scope) < 0) {
+            return `${args.options.scope} is not a valid scope. Allowed values are ${_a.scopes.join(', ')}`;
         }
-        if (args.options.location && SpoCommandSetAddCommand.locations.indexOf(args.options.location) < 0) {
-            return `${args.options.location} is not a valid location. Allowed values are ${SpoCommandSetAddCommand.locations.join(', ')}`;
+        if (args.options.location && _a.locations.indexOf(args.options.location) < 0) {
+            return `${args.options.location} is not a valid location. Allowed values are ${_a.locations.join(', ')}`;
         }
         return validation.isValidSharePointUrl(args.options.webUrl);
     });

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

@@ -3,13 +3,13 @@ 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 _SpoCommandSetGetCommand_instances, _SpoCommandSetGetCommand_initTelemetry, _SpoCommandSetGetCommand_initOptions, _SpoCommandSetGetCommand_initValidators, _SpoCommandSetGetCommand_initOptionSets;
-import os from 'os';
+var _SpoCommandSetGetCommand_instances, _a, _SpoCommandSetGetCommand_initTelemetry, _SpoCommandSetGetCommand_initOptions, _SpoCommandSetGetCommand_initValidators, _SpoCommandSetGetCommand_initOptionSets;
 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;
@@ -35,7 +35,7 @@ class SpoCommandSetGetCommand extends SpoCommand {
                 if (commandSet === undefined) {
                     throw `Command set with id ${args.options.id} can't be found.`;
                 }
-                else if (!SpoCommandSetGetCommand.allowedCommandSetLocations.some(allowedLocation => allowedLocation === commandSet.Location)) {
+                else if (!_a.allowedCommandSetLocations.some(allowedLocation => allowedLocation === commandSet.Location)) {
                     throw `Custom action with id ${args.options.id} is not a command set.`;
                 }
                 await logger.log(commandSet);
@@ -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);
                 }
             }
         }
@@ -67,10 +69,10 @@ class SpoCommandSetGetCommand extends SpoCommand {
         }
     }
     getBaseFilter() {
-        return `startswith(Location,'${SpoCommandSetGetCommand.baseLocation}') and`;
+        return `startswith(Location,'${_a.baseLocation}') and`;
     }
 }
-_SpoCommandSetGetCommand_instances = new WeakSet(), _SpoCommandSetGetCommand_initTelemetry = function _SpoCommandSetGetCommand_initTelemetry() {
+_a = SpoCommandSetGetCommand, _SpoCommandSetGetCommand_instances = new WeakSet(), _SpoCommandSetGetCommand_initTelemetry = function _SpoCommandSetGetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             title: typeof args.options.title !== 'undefined',
@@ -90,7 +92,7 @@ _SpoCommandSetGetCommand_instances = new WeakSet(), _SpoCommandSetGetCommand_ini
         option: '-c, --clientSideComponentId [clientSideComponentId]'
     }, {
         option: '-s, --scope [scope]',
-        autocomplete: SpoCommandSetGetCommand.scopes
+        autocomplete: _a.scopes
     });
 }, _SpoCommandSetGetCommand_initValidators = function _SpoCommandSetGetCommand_initValidators() {
     this.validators.push(async (args) => {
@@ -100,8 +102,8 @@ _SpoCommandSetGetCommand_instances = new WeakSet(), _SpoCommandSetGetCommand_ini
         if (args.options.clientSideComponentId && !validation.isValidGuid(args.options.clientSideComponentId)) {
             return `${args.options.clientSideComponentId} is not a valid GUID.`;
         }
-        if (args.options.scope && SpoCommandSetGetCommand.scopes.indexOf(args.options.scope) < 0) {
-            return `${args.options.scope} is not a valid scope. Valid scopes are ${SpoCommandSetGetCommand.scopes.join(', ')}`;
+        if (args.options.scope && _a.scopes.indexOf(args.options.scope) < 0) {
+            return `${args.options.scope} is not a valid scope. Valid scopes are ${_a.scopes.join(', ')}`;
         }
         return validation.isValidSharePointUrl(args.options.webUrl);
     });
@@ -110,6 +112,6 @@ _SpoCommandSetGetCommand_instances = new WeakSet(), _SpoCommandSetGetCommand_ini
 };
 SpoCommandSetGetCommand.scopes = ['All', 'Site', 'Web'];
 SpoCommandSetGetCommand.baseLocation = 'ClientSideExtension.ListViewCommandSet';
-SpoCommandSetGetCommand.allowedCommandSetLocations = [SpoCommandSetGetCommand.baseLocation, `${SpoCommandSetGetCommand.baseLocation}.CommandBar`, `${SpoCommandSetGetCommand.baseLocation}.ContextMenu`];
+SpoCommandSetGetCommand.allowedCommandSetLocations = [_a.baseLocation, `${_a.baseLocation}.CommandBar`, `${_a.baseLocation}.ContextMenu`];
 export default new SpoCommandSetGetCommand();
 //# sourceMappingURL=commandset-get.js.map

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

@@ -3,7 +3,7 @@ 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 _SpoCommandSetListCommand_instances, _SpoCommandSetListCommand_initTelemetry, _SpoCommandSetListCommand_initOptions, _SpoCommandSetListCommand_initValidators;
+var _SpoCommandSetListCommand_instances, _a, _SpoCommandSetListCommand_initTelemetry, _SpoCommandSetListCommand_initOptions, _SpoCommandSetListCommand_initValidators;
 import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -38,7 +38,7 @@ class SpoCommandSetListCommand extends SpoCommand {
         }
     }
 }
-_SpoCommandSetListCommand_instances = new WeakSet(), _SpoCommandSetListCommand_initTelemetry = function _SpoCommandSetListCommand_initTelemetry() {
+_a = SpoCommandSetListCommand, _SpoCommandSetListCommand_instances = new WeakSet(), _SpoCommandSetListCommand_initTelemetry = function _SpoCommandSetListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             scope: args.options.scope || 'All'
@@ -49,12 +49,12 @@ _SpoCommandSetListCommand_instances = new WeakSet(), _SpoCommandSetListCommand_i
         option: '-u, --webUrl <webUrl>'
     }, {
         option: '-s, --scope [scope]',
-        autocomplete: SpoCommandSetListCommand.scopes
+        autocomplete: _a.scopes
     });
 }, _SpoCommandSetListCommand_initValidators = function _SpoCommandSetListCommand_initValidators() {
     this.validators.push(async (args) => {
-        if (args.options.scope && SpoCommandSetListCommand.scopes.indexOf(args.options.scope) < 0) {
-            return `${args.options.scope} is not a valid scope. Valid scopes are ${SpoCommandSetListCommand.scopes.join(', ')}`;
+        if (args.options.scope && _a.scopes.indexOf(args.options.scope) < 0) {
+            return `${args.options.scope} is not a valid scope. Valid scopes are ${_a.scopes.join(', ')}`;
         }
         return validation.isValidSharePointUrl(args.options.webUrl);
     });

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

@@ -3,7 +3,7 @@ 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 _SpoCommandSetRemoveCommand_instances, _SpoCommandSetRemoveCommand_initTelemetry, _SpoCommandSetRemoveCommand_initOptions, _SpoCommandSetRemoveCommand_initValidators, _SpoCommandSetRemoveCommand_initOptionSets;
+var _SpoCommandSetRemoveCommand_instances, _a, _SpoCommandSetRemoveCommand_initTelemetry, _SpoCommandSetRemoveCommand_initOptions, _SpoCommandSetRemoveCommand_initValidators, _SpoCommandSetRemoveCommand_initOptionSets;
 import commands from '../../commands.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.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];
     }
@@ -87,7 +88,7 @@ class SpoCommandSetRemoveCommand extends SpoCommand {
         }
     }
 }
-_SpoCommandSetRemoveCommand_instances = new WeakSet(), _SpoCommandSetRemoveCommand_initTelemetry = function _SpoCommandSetRemoveCommand_initTelemetry() {
+_a = SpoCommandSetRemoveCommand, _SpoCommandSetRemoveCommand_instances = new WeakSet(), _SpoCommandSetRemoveCommand_initTelemetry = function _SpoCommandSetRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             title: typeof args.options.title !== 'undefined',
@@ -107,7 +108,7 @@ _SpoCommandSetRemoveCommand_instances = new WeakSet(), _SpoCommandSetRemoveComma
     }, {
         option: '-c, --clientSideComponentId  [clientSideComponentId]'
     }, {
-        option: '-s, --scope [scope]', autocomplete: SpoCommandSetRemoveCommand.scopes
+        option: '-s, --scope [scope]', autocomplete: _a.scopes
     }, {
         option: '-f, --force'
     });
@@ -119,8 +120,8 @@ _SpoCommandSetRemoveCommand_instances = new WeakSet(), _SpoCommandSetRemoveComma
         if (args.options.clientSideComponentId && !validation.isValidGuid(args.options.clientSideComponentId)) {
             return `${args.options.clientSideComponentId} is not a valid GUID`;
         }
-        if (args.options.scope && SpoCommandSetRemoveCommand.scopes.indexOf(args.options.scope) < 0) {
-            return `${args.options.scope} is not a valid scope. Allowed values are ${SpoCommandSetRemoveCommand.scopes.join(', ')}`;
+        if (args.options.scope && _a.scopes.indexOf(args.options.scope) < 0) {
+            return `${args.options.scope} is not a valid scope. Allowed values are ${_a.scopes.join(', ')}`;
         }
         return validation.isValidSharePointUrl(args.options.webUrl);
     });

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

@@ -3,13 +3,14 @@ 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 _SpoCommandSetSetCommand_instances, _SpoCommandSetSetCommand_initTelemetry, _SpoCommandSetSetCommand_initOptions, _SpoCommandSetSetCommand_initValidators, _SpoCommandSetSetCommand_initOptionSets;
+var _SpoCommandSetSetCommand_instances, _a, _SpoCommandSetSetCommand_initTelemetry, _SpoCommandSetSetCommand_initOptions, _SpoCommandSetSetCommand_initValidators, _SpoCommandSetSetCommand_initOptionSets;
 import commands from '../../commands.js';
 import { validation } from '../../../../utils/validation.js';
 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];
     }
@@ -109,7 +111,7 @@ class SpoCommandSetSetCommand extends SpoCommand {
         }
     }
 }
-_SpoCommandSetSetCommand_instances = new WeakSet(), _SpoCommandSetSetCommand_initTelemetry = function _SpoCommandSetSetCommand_initTelemetry() {
+_a = SpoCommandSetSetCommand, _SpoCommandSetSetCommand_instances = new WeakSet(), _SpoCommandSetSetCommand_initTelemetry = function _SpoCommandSetSetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             title: typeof args.options.title !== 'undefined',
@@ -136,13 +138,13 @@ _SpoCommandSetSetCommand_instances = new WeakSet(), _SpoCommandSetSetCommand_ini
     }, {
         option: '--newTitle [newTitle]'
     }, {
-        option: '-l, --listType [listType]', autocomplete: SpoCommandSetSetCommand.listTypes
+        option: '-l, --listType [listType]', autocomplete: _a.listTypes
     }, {
         option: '--clientSideComponentProperties  [clientSideComponentProperties]'
     }, {
-        option: '-s, --scope [scope]', autocomplete: SpoCommandSetSetCommand.scopes
+        option: '-s, --scope [scope]', autocomplete: _a.scopes
     }, {
-        option: '--location [location]', autocomplete: SpoCommandSetSetCommand.locations
+        option: '--location [location]', autocomplete: _a.locations
     });
 }, _SpoCommandSetSetCommand_initValidators = function _SpoCommandSetSetCommand_initValidators() {
     this.validators.push(async (args) => {
@@ -155,14 +157,14 @@ _SpoCommandSetSetCommand_instances = new WeakSet(), _SpoCommandSetSetCommand_ini
         if (args.options.newClientSideComponentId && !validation.isValidGuid(args.options.newClientSideComponentId)) {
             return `${args.options.newClientSideComponentId} is not a valid GUID`;
         }
-        if (args.options.listType && SpoCommandSetSetCommand.listTypes.indexOf(args.options.listType) < 0) {
-            return `${args.options.listType} is not a valid list type. Allowed values are ${SpoCommandSetSetCommand.listTypes.join(', ')}`;
+        if (args.options.listType && _a.listTypes.indexOf(args.options.listType) < 0) {
+            return `${args.options.listType} is not a valid list type. Allowed values are ${_a.listTypes.join(', ')}`;
         }
-        if (args.options.scope && SpoCommandSetSetCommand.scopes.indexOf(args.options.scope) < 0) {
-            return `${args.options.scope} is not a valid scope. Allowed values are ${SpoCommandSetSetCommand.scopes.join(', ')}`;
+        if (args.options.scope && _a.scopes.indexOf(args.options.scope) < 0) {
+            return `${args.options.scope} is not a valid scope. Allowed values are ${_a.scopes.join(', ')}`;
         }
-        if (args.options.location && SpoCommandSetSetCommand.locations.indexOf(args.options.location) < 0) {
-            return `${args.options.location} is not a valid location. Allowed values are ${SpoCommandSetSetCommand.locations.join(', ')}`;
+        if (args.options.location && _a.locations.indexOf(args.options.location) < 0) {
+            return `${args.options.location} is not a valid location. Allowed values are ${_a.locations.join(', ')}`;
         }
         if (!args.options.newTitle && !args.options.listType && !args.options.clientSideComponentProperties && !args.options.location && !args.options.newClientSideComponentId) {
             return `Please specify option to be updated`;

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-add.js

@@ -54,7 +54,7 @@ class SpoFileAddCommand extends SpoCommand {
         try {
             try {
                 const requestOptions = {
-                    url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting.encodeQueryParameter(folderPath)}')`,
+                    url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(folderPath)}')`,
                     headers: {
                         'accept': 'application/json;odata=nometadata'
                     }
@@ -88,7 +88,7 @@ class SpoFileAddCommand extends SpoCommand {
                 // initiate chunked upload session
                 const uploadId = v4();
                 const requestOptions = {
-                    url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting.encodeQueryParameter(folderPath)}')/Files/GetByPathOrAddStub(DecodedUrl='${formatting.encodeQueryParameter(fileName)}')/StartUpload(uploadId=guid'${uploadId}')`,
+                    url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(folderPath)}')/Files/GetByPathOrAddStub(DecodedUrl='${formatting.encodeQueryParameter(fileName)}')/StartUpload(uploadId=guid'${uploadId}')`,
                     headers: {
                         'accept': 'application/json;odata=nometadata'
                     }
@@ -116,7 +116,7 @@ class SpoFileAddCommand extends SpoCommand {
                         await logger.logToStderr('Cancelling upload session due to error...');
                     }
                     const requestOptions = {
-                        url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting.encodeQueryParameter(folderPath)}')/Files('${formatting.encodeQueryParameter(fileName)}')/cancelupload(uploadId=guid'${uploadId}')`,
+                        url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(folderPath)}')/Files('${formatting.encodeQueryParameter(fileName)}')/cancelupload(uploadId=guid'${uploadId}')`,
                         headers: {
                             'accept': 'application/json;odata=nometadata'
                         }
@@ -138,7 +138,7 @@ class SpoFileAddCommand extends SpoCommand {
                 const fileBody = fs.readFileSync(fullPath);
                 const bodyLength = fileBody.byteLength;
                 const requestOptions = {
-                    url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting.encodeQueryParameter(folderPath)}')/Files/Add(url='${formatting.encodeQueryParameter(fileName)}', overwrite=true)`,
+                    url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(folderPath)}')/Files/Add(url='${formatting.encodeQueryParameter(fileName)}', overwrite=true)`,
                     data: fileBody,
                     headers: {
                         'accept': 'application/json;odata=nometadata',
@@ -180,7 +180,7 @@ class SpoFileAddCommand extends SpoCommand {
                 }
                 // approve the existing file with given comment
                 const requestOptions = {
-                    url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting.encodeQueryParameter(folderPath)}')/Files('${formatting.encodeQueryParameter(fileName)}')/approve(comment='${formatting.encodeQueryParameter(args.options.approveComment || '')}')`,
+                    url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(folderPath)}')/Files('${formatting.encodeQueryParameter(fileName)}')/approve(comment='${formatting.encodeQueryParameter(args.options.approveComment || '')}')`,
                     headers: {
                         'accept': 'application/json;odata=nometadata'
                     },
@@ -197,7 +197,7 @@ class SpoFileAddCommand extends SpoCommand {
                 }
                 // publish the existing file with given comment
                 const requestOptions = {
-                    url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting.encodeQueryParameter(folderPath)}')/Files('${formatting.encodeQueryParameter(fileName)}')/publish(comment='${formatting.encodeQueryParameter(args.options.publishComment || '')}')`,
+                    url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(folderPath)}')/Files('${formatting.encodeQueryParameter(fileName)}')/publish(comment='${formatting.encodeQueryParameter(args.options.publishComment || '')}')`,
                     headers: {
                         'accept': 'application/json;odata=nometadata'
                     },
@@ -211,7 +211,7 @@ class SpoFileAddCommand extends SpoCommand {
                 // in a case the command has done checkout
                 // then have to rollback the checkout
                 const requestOptions = {
-                    url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting.encodeQueryParameter(folderPath)}')/Files('${formatting.encodeQueryParameter(fileName)}')/UndoCheckOut()`
+                    url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(folderPath)}')/Files('${formatting.encodeQueryParameter(fileName)}')/UndoCheckOut()`
                 };
                 try {
                     await request.post(requestOptions);
@@ -250,14 +250,14 @@ class SpoFileAddCommand extends SpoCommand {
     async fileCheckOut(fileName, webUrl, folder) {
         // check if file already exists, otherwise it can't be checked out
         const requestOptionsGetFile = {
-            url: `${webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting.encodeQueryParameter(folder)}')/Files('${formatting.encodeQueryParameter(fileName)}')`,
+            url: `${webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(folder)}')/Files('${formatting.encodeQueryParameter(fileName)}')`,
             headers: {
                 'accept': 'application/json;odata=nometadata'
             }
         };
         await request.get(requestOptionsGetFile);
         const requestOptionsCheckOut = {
-            url: `${webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting.encodeQueryParameter(folder)}')/Files('${formatting.encodeQueryParameter(fileName)}')/CheckOut()`,
+            url: `${webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(folder)}')/Files('${formatting.encodeQueryParameter(fileName)}')/CheckOut()`,
             headers: {
                 'accept': 'application/json;odata=nometadata'
             },
@@ -281,7 +281,7 @@ class SpoFileAddCommand extends SpoCommand {
                 fileBuffer = fileBuffer.slice(0, readCount);
             }
             const requestOptions = {
-                url: `${info.WebUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting.encodeQueryParameter(info.FolderPath)}')/Files('${formatting.encodeQueryParameter(info.Name)}')/${isLastChunk ? 'Finish' : 'Continue'}Upload(uploadId=guid'${info.Id}',fileOffset=${offset})`,
+                url: `${info.WebUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(info.FolderPath)}')/Files('${formatting.encodeQueryParameter(info.Name)}')/${isLastChunk ? 'Finish' : 'Continue'}Upload(uploadId=guid'${info.Id}',fileOffset=${offset})`,
                 data: fileBuffer,
                 headers: {
                     'accept': 'application/json;odata=nometadata',
@@ -338,7 +338,7 @@ class SpoFileAddCommand extends SpoCommand {
             await logger.logToStderr(`Getting list details in order to get its available content types afterwards...`);
         }
         const requestOptions = {
-            url: `${webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting.encodeQueryParameter(folder)}')/Files('${formatting.encodeQueryParameter(fileName)}')/ListItemAllFields/ParentList?$Select=Id,EnableModeration,EnableVersioning,EnableMinorVersions`,
+            url: `${webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(folder)}')/Files('${formatting.encodeQueryParameter(fileName)}')/ListItemAllFields/ParentList?$Select=Id,EnableModeration,EnableVersioning,EnableMinorVersions`,
             headers: {
                 'accept': 'application/json;odata=nometadata'
             },
@@ -361,7 +361,7 @@ class SpoFileAddCommand extends SpoCommand {
         }
         // update the existing file list item fields
         const requestOptions = {
-            url: `${webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting.encodeQueryParameter(folderPath)}')/Files('${formatting.encodeQueryParameter(fileName)}')/ListItemAllFields/ValidateUpdateListItem()`,
+            url: `${webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(folderPath)}')/Files('${formatting.encodeQueryParameter(fileName)}')/ListItemAllFields/ValidateUpdateListItem()`,
             headers: {
                 'accept': 'application/json;odata=nometadata'
             },
@@ -380,7 +380,7 @@ class SpoFileAddCommand extends SpoCommand {
     }
     async fileCheckIn(args, fileName) {
         const requestOptions = {
-            url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting.encodeQueryParameter(args.options.folder)}')/Files('${formatting.encodeQueryParameter(fileName)}')/CheckIn(comment='${formatting.encodeQueryParameter(args.options.checkInComment || '')}',checkintype=0)`,
+            url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(args.options.folder)}')/Files('${formatting.encodeQueryParameter(fileName)}')/CheckIn(comment='${formatting.encodeQueryParameter(args.options.checkInComment || '')}',checkintype=0)`,
             headers: {
                 'accept': 'application/json;odata=nometadata'
             },

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

@@ -55,7 +55,7 @@ class SpoFileCheckinCommand extends SpoCommand {
         }
         if (args.options.url) {
             const serverRelativePath = urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
-            requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting.encodeQueryParameter(serverRelativePath)}')/checkin(comment='${comment}',checkintype=${type})`;
+            requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(serverRelativePath)}')/checkin(comment='${comment}',checkintype=${type})`;
         }
         const requestOptions = {
             url: requestUrl,

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

@@ -35,7 +35,7 @@ class SpoFileCheckoutCommand extends SpoCommand {
         }
         if (args.options.url) {
             const serverRelativePath = urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
-            requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting.encodeQueryParameter(serverRelativePath)}')/checkout`;
+            requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(serverRelativePath)}')/checkout`;
         }
         const requestOptions = {
             url: requestUrl,