@pnp/cli-microsoft365 7.0.0-beta.093ef31 → 7.0.0-beta.14c7857

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

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

package/dist/m365/spfx/commands/project/project-upgrade/rules/FN001022_DEP_office_ui_fabric_react.js

@@ -2,7 +2,7 @@ import { spfx } from "../../../../../../utils/spfx.js";
 import { DependencyRule } from "./DependencyRule.js";
 export class FN001022_DEP_office_ui_fabric_react extends DependencyRule {
     constructor(packageVersion, add = true) {
-        super('office-ui-fabric-react', packageVersion, false, add);
+        super('office-ui-fabric-react', packageVersion, false, true, add);
     }
     get id() {
         return 'FN001022';

package/dist/m365/spfx/commands/project/project-upgrade/rules/FN002028_DEVDEP_microsoft_rush_stack_compiler_4_7.js

@@ -0,0 +1,13 @@
+import { DependencyRule } from "./DependencyRule.js";
+export class FN002028_DEVDEP_microsoft_rush_stack_compiler_4_7 extends DependencyRule {
+    constructor(packageVersion) {
+        super('@microsoft/rush-stack-compiler-4.7', packageVersion, true);
+    }
+    get id() {
+        return 'FN002028';
+    }
+    get supersedes() {
+        return ['FN002010', 'FN002011', 'FN002012', 'FN002017', 'FN002018', 'FN002020'];
+    }
+}
+//# sourceMappingURL=FN002028_DEVDEP_microsoft_rush_stack_compiler_4_7.js.map

package/dist/m365/spfx/commands/project/project-upgrade/{upgrade-1.18.0-beta.5.js → upgrade-1.18.0.js}

@@ -24,36 +24,44 @@ import { FN002001_DEVDEP_microsoft_sp_build_web } from './rules/FN002001_DEVDEP_
 import { FN002002_DEVDEP_microsoft_sp_module_interfaces } from './rules/FN002002_DEVDEP_microsoft_sp_module_interfaces.js';
 import { FN002022_DEVDEP_microsoft_eslint_plugin_spfx } from './rules/FN002022_DEVDEP_microsoft_eslint_plugin_spfx.js';
 import { FN002023_DEVDEP_microsoft_eslint_config_spfx } from './rules/FN002023_DEVDEP_microsoft_eslint_config_spfx.js';
+import { FN002026_DEVDEP_typescript } from './rules/FN002026_DEVDEP_typescript.js';
+import { FN002028_DEVDEP_microsoft_rush_stack_compiler_4_7 } from './rules/FN002028_DEVDEP_microsoft_rush_stack_compiler_4_7.js';
 import { FN010001_YORC_version } from './rules/FN010001_YORC_version.js';
 import { FN010010_YORC_sdkVersions_teams_js } from './rules/FN010010_YORC_sdkVersions_teams_js.js';
+import { FN012017_TSC_extends } from './rules/FN012017_TSC_extends.js';
+import { FN021003_PKG_engines_node } from './rules/FN021003_PKG_engines_node.js';
 export default [
-    new FN001001_DEP_microsoft_sp_core_library('1.18.0-beta.5'),
-    new FN001002_DEP_microsoft_sp_lodash_subset('1.18.0-beta.5'),
-    new FN001003_DEP_microsoft_sp_office_ui_fabric_core('1.18.0-beta.5'),
-    new FN001004_DEP_microsoft_sp_webpart_base('1.18.0-beta.5'),
-    new FN001011_DEP_microsoft_sp_dialog('1.18.0-beta.5'),
-    new FN001012_DEP_microsoft_sp_application_base('1.18.0-beta.5'),
-    new FN001014_DEP_microsoft_sp_listview_extensibility('1.18.0-beta.5'),
-    new FN001021_DEP_microsoft_sp_property_pane('1.18.0-beta.5'),
+    new FN001001_DEP_microsoft_sp_core_library('1.18.0'),
+    new FN001002_DEP_microsoft_sp_lodash_subset('1.18.0'),
+    new FN001003_DEP_microsoft_sp_office_ui_fabric_core('1.18.0'),
+    new FN001004_DEP_microsoft_sp_webpart_base('1.18.0'),
+    new FN001011_DEP_microsoft_sp_dialog('1.18.0'),
+    new FN001012_DEP_microsoft_sp_application_base('1.18.0'),
+    new FN001014_DEP_microsoft_sp_listview_extensibility('1.18.0'),
+    new FN001021_DEP_microsoft_sp_property_pane('1.18.0'),
     new FN001022_DEP_office_ui_fabric_react('', false),
-    new FN001023_DEP_microsoft_sp_component_base('1.18.0-beta.5'),
-    new FN001024_DEP_microsoft_sp_diagnostics('1.18.0-beta.5'),
-    new FN001025_DEP_microsoft_sp_dynamic_data('1.18.0-beta.5'),
-    new FN001026_DEP_microsoft_sp_extension_base('1.18.0-beta.5'),
-    new FN001027_DEP_microsoft_sp_http('1.18.0-beta.5'),
-    new FN001028_DEP_microsoft_sp_list_subscription('1.18.0-beta.5'),
-    new FN001029_DEP_microsoft_sp_loader('1.18.0-beta.5'),
-    new FN001030_DEP_microsoft_sp_module_interfaces('1.18.0-beta.5'),
-    new FN001031_DEP_microsoft_sp_odata_types('1.18.0-beta.5'),
-    new FN001032_DEP_microsoft_sp_page_context('1.18.0-beta.5'),
+    new FN001023_DEP_microsoft_sp_component_base('1.18.0'),
+    new FN001024_DEP_microsoft_sp_diagnostics('1.18.0'),
+    new FN001025_DEP_microsoft_sp_dynamic_data('1.18.0'),
+    new FN001026_DEP_microsoft_sp_extension_base('1.18.0'),
+    new FN001027_DEP_microsoft_sp_http('1.18.0'),
+    new FN001028_DEP_microsoft_sp_list_subscription('1.18.0'),
+    new FN001029_DEP_microsoft_sp_loader('1.18.0'),
+    new FN001030_DEP_microsoft_sp_module_interfaces('1.18.0'),
+    new FN001031_DEP_microsoft_sp_odata_types('1.18.0'),
+    new FN001032_DEP_microsoft_sp_page_context('1.18.0'),
     new FN001035_DEP_fluentui_react('8.106.4'),
-    new FN001013_DEP_microsoft_decorators('1.18.0-beta.5'),
-    new FN001034_DEP_microsoft_sp_adaptive_card_extension_base('1.18.0-beta.5'),
-    new FN002022_DEVDEP_microsoft_eslint_plugin_spfx('1.18.0-beta.5'),
-    new FN002023_DEVDEP_microsoft_eslint_config_spfx('1.18.0-beta.5'),
-    new FN002001_DEVDEP_microsoft_sp_build_web('1.18.0-beta.5'),
-    new FN002002_DEVDEP_microsoft_sp_module_interfaces('1.18.0-beta.5'),
-    new FN010001_YORC_version('1.18.0-beta.5'),
-    new FN010010_YORC_sdkVersions_teams_js('2.12.0')
+    new FN001013_DEP_microsoft_decorators('1.18.0'),
+    new FN001034_DEP_microsoft_sp_adaptive_card_extension_base('1.18.0'),
+    new FN002001_DEVDEP_microsoft_sp_build_web('1.18.0'),
+    new FN002002_DEVDEP_microsoft_sp_module_interfaces('1.18.0'),
+    new FN002022_DEVDEP_microsoft_eslint_plugin_spfx('1.18.0'),
+    new FN002023_DEVDEP_microsoft_eslint_config_spfx('1.18.0'),
+    new FN002026_DEVDEP_typescript('4.7.4'),
+    new FN002028_DEVDEP_microsoft_rush_stack_compiler_4_7('0.1.0'),
+    new FN010001_YORC_version('1.18.0'),
+    new FN010010_YORC_sdkVersions_teams_js('2.12.0'),
+    new FN012017_TSC_extends('./node_modules/@microsoft/rush-stack-compiler-4.7/includes/tsconfig-web.json'),
+    new FN021003_PKG_engines_node('>=16.13.0 <17.0.0 || >=18.17.1 <19.0.0')
 ];
-//# sourceMappingURL=upgrade-1.18.0-beta.5.js.map
+//# sourceMappingURL=upgrade-1.18.0.js.map

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

@@ -7,8 +7,6 @@ var _SpfxProjectUpgradeCommand_instances, _a, _SpfxProjectUpgradeCommand_initTel
 import fs from 'fs';
 import os from 'os';
 import path from 'path';
-// uncomment to support upgrading to preview releases
-import { prerelease } from 'semver';
 import { CommandError } from '../../../../Command.js';
 import { fsUtil } from '../../../../utils/fsUtil.js';
 import { packageManager } from '../../../../utils/packageManager.js';
@@ -71,7 +69,7 @@ class SpfxProjectUpgradeCommand extends BaseProjectCommand {
             '1.17.2',
             '1.17.3',
             '1.17.4',
-            '1.18.0-beta.5'
+            '1.18.0'
         ];
         __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initOptions).call(this);
@@ -84,15 +82,15 @@ class SpfxProjectUpgradeCommand extends BaseProjectCommand {
         }
         this.toVersion = args.options.toVersion ? args.options.toVersion : this.supportedVersions[this.supportedVersions.length - 1];
         // uncomment to support upgrading to preview releases
-        if (!args.options.toVersion &&
-            !args.options.preview &&
-            prerelease(this.toVersion)) {
-            // no version and no preview specified while the current version to
-            // upgrade to is a prerelease so let's grab the first non-preview version
-            // since we're supporting only one preview version, it's sufficient for
-            // us to take second to last version
-            this.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
-        }
+        // if (!args.options.toVersion &&
+        //   !args.options.preview &&
+        //   prerelease(this.toVersion)) {
+        //   // no version and no preview specified while the current version to
+        //   // upgrade to is a prerelease so let's grab the first non-preview version
+        //   // since we're supporting only one preview version, it's sufficient for
+        //   // us to take second to last version
+        //   this.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
+        // }
         this.packageManager = args.options.packageManager || 'npm';
         this.shell = args.options.shell || 'bash';
         if (this.supportedVersions.indexOf(this.toVersion) < 0) {
@@ -479,9 +477,9 @@ _a = SpfxProjectUpgradeCommand, _SpfxProjectUpgradeCommand_instances = new WeakS
             preview: args.options.preview
         });
         // uncomment to support upgrading to preview releases
-        if (prerelease(this.telemetryProperties.toVersion) && !args.options.preview) {
-            this.telemetryProperties.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
-        }
+        // if (prerelease(this.telemetryProperties.toVersion) && !args.options.preview) {
+        //   this.telemetryProperties.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
+        // }
     });
 }, _SpfxProjectUpgradeCommand_initOptions = function _SpfxProjectUpgradeCommand_initOptions() {
     this.options.unshift({

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

@@ -524,14 +524,14 @@ class SpfxDoctorCommand extends BaseProjectCommand {
                     fix: 'npm i -g yo@4'
                 }
             },
-            '1.18.0-beta.5': {
+            '1.18.0': {
                 gulpCli: {
                     range: '^1 || ^2',
                     fix: 'npm i -g gulp-cli@2'
                 },
                 node: {
-                    range: '>=16.14.0 <17.0.0',
-                    fix: 'Install Node.js >=16.14.0 <17.0.0'
+                    range: '>=16.13.0 <17.0.0 || >=18.17.1 <19.0.0',
+                    fix: 'Install Node.js >=16.13.0 <17.0.0 || >=18.17.1 <19.0.0'
                 },
                 sp: SharePointVersion.SPO,
                 yo: {

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

@@ -9,6 +9,7 @@ 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 SpoApplicationCustomizerGetCommand extends SpoCommand {
     get name() {
         return commands.APPLICATIONCUSTOMIZER_GET;
@@ -69,12 +70,13 @@ class SpoApplicationCustomizerGetCommand extends SpoCommand {
         if (customActions.length === 1) {
             return customActions[0];
         }
-        const errorMessage = options.title ? `title '${options.title}'` : `Client Side Component Id '${options.clientSideComponentId}'`;
+        const identifier = options.title ? `title '${options.title}'` : `Client Side Component Id '${options.clientSideComponentId}'`;
         if (customActions.length === 0) {
-            throw `No application customizer with ${errorMessage} found`;
+            throw `No application customizer with ${identifier} found`;
         }
         else {
-            throw `Multiple application customizers with ${errorMessage} found. Please disambiguate using IDs: ${customActions.map(a => a.Id).join(', ')}`;
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('Id', customActions);
+            return await Cli.handleMultipleResultsFound(`Multiple application customizers with ${identifier} found.`, resultAsKeyValuePair);
         }
     }
     humanizeScope(scope) {

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-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