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

package/dist/m365/planner/commands/task/task-get.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 _PlannerTaskGetCommand_instances, _PlannerTaskGetCommand_initTelemetry, _PlannerTaskGetCommand_initOptions, _PlannerTaskGetCommand_initValidators, _PlannerTaskGetCommand_initOptionSets;
+var _PlannerTaskGetCommand_instances, _PlannerTaskGetCommand_initTelemetry, _PlannerTaskGetCommand_initOptions, _PlannerTaskGetCommand_initValidators, _PlannerTaskGetCommand_initOptionSets, _PlannerTaskGetCommand_initTypes;
 import request from '../../../../request.js';
 import { aadGroup } from '../../../../utils/aadGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -11,6 +11,7 @@ import { planner } from '../../../../utils/planner.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+import { Cli } from '../../../../cli/Cli.js';
 class PlannerTaskGetCommand extends GraphCommand {
     get name() {
         return commands.TASK_GET;
@@ -25,6 +26,7 @@ class PlannerTaskGetCommand extends GraphCommand {
         __classPrivateFieldGet(this, _PlannerTaskGetCommand_instances, "m", _PlannerTaskGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _PlannerTaskGetCommand_instances, "m", _PlannerTaskGetCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _PlannerTaskGetCommand_instances, "m", _PlannerTaskGetCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _PlannerTaskGetCommand_instances, "m", _PlannerTaskGetCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         try {
@@ -78,7 +80,9 @@ class PlannerTaskGetCommand extends GraphCommand {
             throw `The specified task ${options.title} does not exist`;
         }
         if (tasks.length > 1) {
-            throw `Multiple tasks with title ${options.title} found: ${tasks.map(x => x.id)}`;
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', tasks);
+            const result = (await Cli.handleMultipleResultsFound(`Multiple tasks with title '${options.title}' found.`, resultAsKeyValuePair));
+            return result.id;
         }
         return tasks[0].id;
     }
@@ -101,7 +105,9 @@ class PlannerTaskGetCommand extends GraphCommand {
             throw `The specified bucket ${options.bucketName} does not exist`;
         }
         if (buckets.length > 1) {
-            throw `Multiple buckets with name ${options.bucketName} found: ${buckets.map(x => x.id)}`;
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', buckets);
+            const result = await Cli.handleMultipleResultsFound(`Multiple buckets with name '${options.bucketName}' found.`, resultAsKeyValuePair);
+            return result.id;
         }
         return buckets[0].id;
     }
@@ -179,6 +185,8 @@ _PlannerTaskGetCommand_instances = new WeakSet(), _PlannerTaskGetCommand_initTel
             return args.options.planTitle !== undefined;
         }
     });
+}, _PlannerTaskGetCommand_initTypes = function _PlannerTaskGetCommand_initTypes() {
+    this.types.string.push('id', 'title', 'planId', 'planTitle', 'ownerGroupId', 'ownerGroupName', 'bucketId', 'bucketName', 'rosterId');
 };
 export default new PlannerTaskGetCommand();
 //# sourceMappingURL=task-get.js.map

package/dist/m365/planner/commands/task/task-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 _PlannerTaskListCommand_instances, _PlannerTaskListCommand_initTelemetry, _PlannerTaskListCommand_initOptions, _PlannerTaskListCommand_initValidators, _PlannerTaskListCommand_initOptionSets;
+var _PlannerTaskListCommand_instances, _PlannerTaskListCommand_initTelemetry, _PlannerTaskListCommand_initOptions, _PlannerTaskListCommand_initValidators, _PlannerTaskListCommand_initOptionSets, _PlannerTaskListCommand_initTypes;
 import request from '../../../../request.js';
 import { aadGroup } from '../../../../utils/aadGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -29,6 +29,7 @@ class PlannerTaskListCommand extends GraphCommand {
         __classPrivateFieldGet(this, _PlannerTaskListCommand_instances, "m", _PlannerTaskListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _PlannerTaskListCommand_instances, "m", _PlannerTaskListCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _PlannerTaskListCommand_instances, "m", _PlannerTaskListCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _PlannerTaskListCommand_instances, "m", _PlannerTaskListCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         const bucketName = args.options.bucketName;
@@ -157,7 +158,12 @@ _PlannerTaskListCommand_instances = new WeakSet(), _PlannerTaskListCommand_initT
         return true;
     });
 }, _PlannerTaskListCommand_initOptionSets = function _PlannerTaskListCommand_initOptionSets() {
-    this.optionSets.push({ options: ['bucketId', 'bucketName'] }, {
+    this.optionSets.push({
+        options: ['bucketId', 'bucketName'],
+        runsWhen: (args) => {
+            return args.options.bucketId !== undefined || args.options.bucketName !== undefined;
+        }
+    }, {
         options: ['planId', 'planTitle'],
         runsWhen: (args) => {
             return args.options.bucketName !== undefined && args.options.rosterId === undefined;
@@ -168,6 +174,8 @@ _PlannerTaskListCommand_instances = new WeakSet(), _PlannerTaskListCommand_initT
             return args.options.planTitle !== undefined;
         }
     });
+}, _PlannerTaskListCommand_initTypes = function _PlannerTaskListCommand_initTypes() {
+    this.types.string.push('planId', 'planTitle', 'ownerGroupId', 'ownerGroupName', 'bucketId', 'bucketName', 'rosterId');
 };
 export default new PlannerTaskListCommand();
 //# sourceMappingURL=task-list.js.map

package/dist/m365/planner/commands/task/task-reference-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 _PlannerTaskReferenceAddCommand_instances, _PlannerTaskReferenceAddCommand_initTelemetry, _PlannerTaskReferenceAddCommand_initOptions, _PlannerTaskReferenceAddCommand_initValidators;
+var _PlannerTaskReferenceAddCommand_instances, _PlannerTaskReferenceAddCommand_initTelemetry, _PlannerTaskReferenceAddCommand_initOptions, _PlannerTaskReferenceAddCommand_initValidators, _PlannerTaskReferenceAddCommand_initTypes;
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import GraphCommand from '../../../base/GraphCommand.js';
@@ -21,6 +21,7 @@ class PlannerTaskReferenceAddCommand extends GraphCommand {
         __classPrivateFieldGet(this, _PlannerTaskReferenceAddCommand_instances, "m", _PlannerTaskReferenceAddCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _PlannerTaskReferenceAddCommand_instances, "m", _PlannerTaskReferenceAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _PlannerTaskReferenceAddCommand_instances, "m", _PlannerTaskReferenceAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _PlannerTaskReferenceAddCommand_instances, "m", _PlannerTaskReferenceAddCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         try {
@@ -82,6 +83,8 @@ _PlannerTaskReferenceAddCommand_instances = new WeakSet(), _PlannerTaskReference
         }
         return true;
     });
+}, _PlannerTaskReferenceAddCommand_initTypes = function _PlannerTaskReferenceAddCommand_initTypes() {
+    this.types.string.push('taskId', 'url', 'alias', 'type');
 };
 export default new PlannerTaskReferenceAddCommand();
 //# sourceMappingURL=task-reference-add.js.map

package/dist/m365/planner/commands/task/task-reference-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 _PlannerTaskReferenceListCommand_instances, _PlannerTaskReferenceListCommand_initOptions;
+var _PlannerTaskReferenceListCommand_instances, _PlannerTaskReferenceListCommand_initOptions, _PlannerTaskReferenceListCommand_initTypes;
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import GraphCommand from '../../../base/GraphCommand.js';
@@ -19,6 +19,7 @@ class PlannerTaskReferenceListCommand extends GraphCommand {
         super();
         _PlannerTaskReferenceListCommand_instances.add(this);
         __classPrivateFieldGet(this, _PlannerTaskReferenceListCommand_instances, "m", _PlannerTaskReferenceListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _PlannerTaskReferenceListCommand_instances, "m", _PlannerTaskReferenceListCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         const requestOptions = {
@@ -41,6 +42,8 @@ _PlannerTaskReferenceListCommand_instances = new WeakSet(), _PlannerTaskReferenc
     this.options.unshift({
         option: '-i, --taskId <taskId>'
     });
+}, _PlannerTaskReferenceListCommand_initTypes = function _PlannerTaskReferenceListCommand_initTypes() {
+    this.types.string.push('taskId');
 };
 export default new PlannerTaskReferenceListCommand();
 //# sourceMappingURL=task-reference-list.js.map

package/dist/m365/planner/commands/task/task-reference-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 _PlannerTaskReferenceRemoveCommand_instances, _PlannerTaskReferenceRemoveCommand_initTelemetry, _PlannerTaskReferenceRemoveCommand_initOptions, _PlannerTaskReferenceRemoveCommand_initValidators, _PlannerTaskReferenceRemoveCommand_initOptionSets;
+var _PlannerTaskReferenceRemoveCommand_instances, _PlannerTaskReferenceRemoveCommand_initTelemetry, _PlannerTaskReferenceRemoveCommand_initOptions, _PlannerTaskReferenceRemoveCommand_initValidators, _PlannerTaskReferenceRemoveCommand_initOptionSets, _PlannerTaskReferenceRemoveCommand_initTypes;
 import { Cli } from '../../../../cli/Cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -23,6 +23,7 @@ class PlannerTaskReferenceRemoveCommand extends GraphCommand {
         __classPrivateFieldGet(this, _PlannerTaskReferenceRemoveCommand_instances, "m", _PlannerTaskReferenceRemoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _PlannerTaskReferenceRemoveCommand_instances, "m", _PlannerTaskReferenceRemoveCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _PlannerTaskReferenceRemoveCommand_instances, "m", _PlannerTaskReferenceRemoveCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _PlannerTaskReferenceRemoveCommand_instances, "m", _PlannerTaskReferenceRemoveCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         if (args.options.force) {
@@ -112,6 +113,8 @@ _PlannerTaskReferenceRemoveCommand_instances = new WeakSet(), _PlannerTaskRefere
     });
 }, _PlannerTaskReferenceRemoveCommand_initOptionSets = function _PlannerTaskReferenceRemoveCommand_initOptionSets() {
     this.optionSets.push({ options: ['url', 'alias'] });
+}, _PlannerTaskReferenceRemoveCommand_initTypes = function _PlannerTaskReferenceRemoveCommand_initTypes() {
+    this.types.string.push('url', 'taskId', 'alias');
 };
 export default new PlannerTaskReferenceRemoveCommand();
 //# sourceMappingURL=task-reference-remove.js.map

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

@@ -3,8 +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 _PlannerTaskRemoveCommand_instances, _PlannerTaskRemoveCommand_initTelemetry, _PlannerTaskRemoveCommand_initOptions, _PlannerTaskRemoveCommand_initValidators, _PlannerTaskRemoveCommand_initOptionSets;
-import os from 'os';
+var _PlannerTaskRemoveCommand_instances, _PlannerTaskRemoveCommand_initTelemetry, _PlannerTaskRemoveCommand_initOptions, _PlannerTaskRemoveCommand_initValidators, _PlannerTaskRemoveCommand_initOptionSets, _PlannerTaskRemoveCommand_initTypes;
 import { Cli } from '../../../../cli/Cli.js';
 import request from '../../../../request.js';
 import { aadGroup } from '../../../../utils/aadGroup.js';
@@ -13,6 +12,7 @@ import { planner } from '../../../../utils/planner.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+import { formatting } from '../../../../utils/formatting.js';
 class PlannerTaskRemoveCommand extends GraphCommand {
     get name() {
         return commands.TASK_REMOVE;
@@ -27,6 +27,7 @@ class PlannerTaskRemoveCommand extends GraphCommand {
         __classPrivateFieldGet(this, _PlannerTaskRemoveCommand_instances, "m", _PlannerTaskRemoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _PlannerTaskRemoveCommand_instances, "m", _PlannerTaskRemoveCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _PlannerTaskRemoveCommand_instances, "m", _PlannerTaskRemoveCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _PlannerTaskRemoveCommand_instances, "m", _PlannerTaskRemoveCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         const removeTask = async () => {
@@ -81,7 +82,8 @@ class PlannerTaskRemoveCommand extends GraphCommand {
             throw `The specified task ${title} does not exist`;
         }
         if (filteredtasks.length > 1) {
-            throw `Multiple tasks with title ${title} found: Please disambiguate: ${os.EOL}${filteredtasks.map(f => `- ${f.id}`).join(os.EOL)}`;
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', filteredtasks);
+            return await Cli.handleMultipleResultsFound(`Multiple tasks with title '${title}' found.`, resultAsKeyValuePair);
         }
         return filteredtasks[0];
     }
@@ -104,7 +106,9 @@ class PlannerTaskRemoveCommand extends GraphCommand {
             throw `The specified bucket ${bucketName} does not exist`;
         }
         if (filteredBuckets.length > 1) {
-            throw `Multiple buckets with name ${bucketName} found: Please disambiguate:${os.EOL}${filteredBuckets.map(f => `- ${f.id}`).join(os.EOL)}`;
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', filteredBuckets);
+            const result = await Cli.handleMultipleResultsFound(`Multiple buckets with name '${bucketName}' found.`, resultAsKeyValuePair);
+            return result.id;
         }
         return filteredBuckets[0].id;
     }
@@ -185,6 +189,8 @@ _PlannerTaskRemoveCommand_instances = new WeakSet(), _PlannerTaskRemoveCommand_i
             return args.options.planTitle !== undefined;
         }
     });
+}, _PlannerTaskRemoveCommand_initTypes = function _PlannerTaskRemoveCommand_initTypes() {
+    this.types.string.push('id', 'title', 'planId', 'planTitle', 'ownerGroupId', 'ownerGroupName', 'bucketId', 'bucketName', 'rosterId');
 };
 export default new PlannerTaskRemoveCommand();
 //# sourceMappingURL=task-remove.js.map

package/dist/m365/planner/commands/task/task-set.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 _PlannerTaskSetCommand_instances, _PlannerTaskSetCommand_initTelemetry, _PlannerTaskSetCommand_initOptions, _PlannerTaskSetCommand_initValidators, _PlannerTaskSetCommand_initOptionSets;
+var _PlannerTaskSetCommand_instances, _PlannerTaskSetCommand_initTelemetry, _PlannerTaskSetCommand_initOptions, _PlannerTaskSetCommand_initValidators, _PlannerTaskSetCommand_initOptionSets, _PlannerTaskSetCommand_initTypes;
 import request from '../../../../request.js';
 import { aadGroup } from '../../../../utils/aadGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -27,6 +27,7 @@ class PlannerTaskSetCommand extends GraphCommand {
         __classPrivateFieldGet(this, _PlannerTaskSetCommand_instances, "m", _PlannerTaskSetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _PlannerTaskSetCommand_instances, "m", _PlannerTaskSetCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _PlannerTaskSetCommand_instances, "m", _PlannerTaskSetCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _PlannerTaskSetCommand_instances, "m", _PlannerTaskSetCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         try {
@@ -305,6 +306,8 @@ _PlannerTaskSetCommand_instances = new WeakSet(), _PlannerTaskSetCommand_initTel
             return args.options.assignedToUserIds || args.options.assignedToUserNames;
         }
     });
+}, _PlannerTaskSetCommand_initTypes = function _PlannerTaskSetCommand_initTypes() {
+    this.types.string.push('id', 'title', 'planId', 'planTitle', 'ownerGroupId', 'ownerGroupName', 'bucketId', 'bucketName', 'description', 'assigneePriority', 'orderHint', 'rosterId', 'startDateTime', 'dueDateTime', 'assignedToUserIds', 'assignedToUserNames', 'assignments', 'appliedCategories');
 };
 export default new PlannerTaskSetCommand();
 //# sourceMappingURL=task-set.js.map

package/dist/m365/pp/commands/aibuildermodel/aibuildermodel-get.js

@@ -4,7 +4,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _PpAiBuilderModelGetCommand_instances, _PpAiBuilderModelGetCommand_initTelemetry, _PpAiBuilderModelGetCommand_initOptions, _PpAiBuilderModelGetCommand_initOptionSets, _PpAiBuilderModelGetCommand_initValidators;
+import { Cli } from '../../../../cli/Cli.js';
 import request from '../../../../request.js';
+import { formatting } from '../../../../utils/formatting.js';
 import { powerPlatform } from '../../../../utils/powerPlatform.js';
 import { validation } from '../../../../utils/validation.js';
 import PowerPlatformCommand from '../../../base/PowerPlatformCommand.js';
@@ -58,7 +60,8 @@ class PpAiBuilderModelGetCommand extends PowerPlatformCommand {
             throw `The specified AI builder model '${options.name}' does not exist.`;
         }
         if (result.value.length > 1) {
-            throw `Multiple AI builder models with name '${options.name}' found: ${result.value.map(x => x.msdyn_aimodelid).join(',')}`;
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('msdyn_aimodelid', result.value);
+            return await Cli.handleMultipleResultsFound(`Multiple AI builder models with name '${options.name}' found.`, resultAsKeyValuePair);
         }
         return result.value[0];
     }

package/dist/m365/pp/commands/card/card-get.js

@@ -10,6 +10,7 @@ import { powerPlatform } from '../../../../utils/powerPlatform.js';
 import { validation } from '../../../../utils/validation.js';
 import PowerPlatformCommand from '../../../base/PowerPlatformCommand.js';
 import commands from '../../commands.js';
+import { formatting } from '../../../../utils/formatting.js';
 class PpCardGetCommand extends PowerPlatformCommand {
     get name() {
         return commands.CARD_GET;
@@ -59,11 +60,8 @@ class PpCardGetCommand extends PowerPlatformCommand {
             throw `The specified card '${options.name}' does not exist.`;
         }
         if (result.value.length > 1) {
-            const resultAsKeyValuePair = {};
-            result.value.forEach((obj) => {
-                resultAsKeyValuePair[obj.cardid] = obj;
-            });
-            return Cli.handleMultipleResultsFound(`Multiple cards with name '${options.name}' found. Choose the correct ID:`, `Multiple cards with name '${options.name}' found.`, resultAsKeyValuePair);
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('cardid', result.value);
+            return Cli.handleMultipleResultsFound(`Multiple cards with name '${options.name}' found`, resultAsKeyValuePair);
         }
         return result.value[0];
     }

package/dist/m365/pp/commands/chatbot/chatbot-get.js

@@ -10,6 +10,7 @@ import { powerPlatform } from '../../../../utils/powerPlatform.js';
 import { validation } from '../../../../utils/validation.js';
 import PowerPlatformCommand from '../../../base/PowerPlatformCommand.js';
 import commands from '../../commands.js';
+import { Cli } from '../../../../cli/Cli.js';
 class PpChatbotGetCommand extends PowerPlatformCommand {
     get name() {
         return commands.CHATBOT_GET;
@@ -56,7 +57,8 @@ class PpChatbotGetCommand extends PowerPlatformCommand {
         requestOptions.url = `${dynamicsApiUrl}/api/data/v9.1/bots?$filter=name eq '${formatting.encodeQueryParameter(options.name)}'`;
         const result = await request.get(requestOptions);
         if (result.value.length > 1) {
-            throw `Multiple chatbots with name '${options.name}' found: ${result.value.map(x => x.botid).join(',')}`;
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('botid', result.value);
+            return await Cli.handleMultipleResultsFound(`Multiple chatbots with name '${options.name}' found.`, resultAsKeyValuePair);
         }
         if (result.value.length === 0) {
             throw `The specified chatbot '${options.name}' does not exist.`;

package/dist/m365/pp/commands/chatbot/chatbot-list.js

@@ -16,7 +16,7 @@ class PpChatbotListCommand extends PowerPlatformCommand {
         return 'Lists Microsoft Power Platform chatbots in the specified Power Platform environment';
     }
     defaultProperties() {
-        return ['displayName', 'botid', 'publishedOn', 'createdOn', 'botModifiedOn'];
+        return ['name', 'botid', 'publishedOn', 'createdOn', 'botModifiedOn'];
     }
     constructor() {
         super();
@@ -55,7 +55,7 @@ class PpChatbotListCommand extends PowerPlatformCommand {
           <attribute name='timezoneruleversionnumber' alias='timezoneRuleVersionNumber' />,
           <attribute name='utcconversiontimezonecode' alias='utcConversionTimezoneCode' />,
           <attribute name='versionnumber' alias='versionNumber' />,
-          <attribute name='name' alias='displayName' />,
+          <attribute name='name' alias='name' />,
           <attribute name='botid' alias='cdsBotId' />,
           <attribute name='ownerid' alias='ownerId' />,
           <attribute name='synchronizationstatus' alias='synchronizationStatus' />

package/dist/m365/pp/commands/managementapp/managementapp-add.js

@@ -9,6 +9,7 @@ import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import PowerPlatformCommand from '../../../base/PowerPlatformCommand.js';
 import commands from '../../commands.js';
+import { Cli } from '../../../../cli/Cli.js';
 class PpManagementAppAddCommand extends PowerPlatformCommand {
     get name() {
         return commands.MANAGEMENTAPP_ADD;
@@ -65,7 +66,9 @@ class PpManagementAppAddCommand extends PowerPlatformCommand {
         if (aadApps.value.length === 1 && aadApps.value[0].appId) {
             return aadApps.value[0].appId;
         }
-        throw `Multiple Azure AD application registration with name ${name} found. Please disambiguate (app IDs): ${aadApps.value.map(a => a.appId).join(', ')}`;
+        const resultAsKeyValuePair = formatting.convertArrayToHashTable('appId', aadApps.value);
+        const result = await Cli.handleMultipleResultsFound(`Multiple Azure AD application registration with name '${name}' found.`, resultAsKeyValuePair);
+        return result.appId;
     }
 }
 _PpManagementAppAddCommand_instances = new WeakSet(), _PpManagementAppAddCommand_initTelemetry = function _PpManagementAppAddCommand_initTelemetry() {

package/dist/m365/search/commands/externalconnection/externalconnection-remove.js

@@ -41,7 +41,9 @@ class SearchExternalConnectionRemoveCommand extends GraphCommand {
         if (res.value.length === 0) {
             throw `The specified connection does not exist in Microsoft Search`;
         }
-        throw `Multiple external connections with name ${args.options.name} found. Please disambiguate (IDs): ${res.value.map(x => x.id).join(', ')}`;
+        const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', res.value);
+        const result = await Cli.handleMultipleResultsFound(`Multiple external connections with name ${args.options.name} found.`, resultAsKeyValuePair);
+        return result.id;
     }
     async commandAction(logger, args) {
         if (args.options.force) {

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

@@ -16,6 +16,6 @@ export default [
     new FN002013_DEVDEP_types_webpack_env('~1.15.2'),
     new FN002015_DEVDEP_types_react('17'),
     new FN002016_DEVDEP_types_react_dom('17'),
-    new FN002019_DEVDEP_microsoft_rush_stack_compiler(['4.5'])
+    new FN002019_DEVDEP_microsoft_rush_stack_compiler(['4.7'])
 ];
-//# sourceMappingURL=doctor-1.18.0-beta.5.js.map
+//# sourceMappingURL=doctor-1.18.0.js.map

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];
     }