@pnp/cli-microsoft365 7.0.0-beta.7f98bac → 7.0.0-beta.8726fe8

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,18 +106,26 @@ 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;
     }
     async getPlanId(options) {
-        const { planId, planTitle } = options;
+        const { planId, planTitle, rosterId } = options;
         if (planId) {
             return planId;
         }
-        const groupId = await this.getGroupId(options);
-        const plan = await planner.getPlanByTitle(planTitle, groupId);
-        return plan.id;
+        if (options.rosterId) {
+            const plan = await planner.getPlanByRosterId(rosterId);
+            return plan.id;
+        }
+        else {
+            const groupId = await this.getGroupId(options);
+            const plan = await planner.getPlanByTitle(planTitle, groupId);
+            return plan.id;
+        }
     }
     async getGroupId(options) {
         const { ownerGroupId, ownerGroupName } = options;
@@ -135,51 +145,52 @@ _PlannerTaskRemoveCommand_instances = new WeakSet(), _PlannerTaskRemoveCommand_i
             bucketName: typeof args.options.bucketName !== 'undefined',
             planId: typeof args.options.planId !== 'undefined',
             planTitle: typeof args.options.planTitle !== 'undefined',
+            rosterId: typeof args.options.rosterId !== 'undefined',
             ownerGroupId: typeof args.options.ownerGroupId !== 'undefined',
             ownerGroupName: typeof args.options.ownerGroupName !== 'undefined',
             force: !!args.options.force
         });
     });
 }, _PlannerTaskRemoveCommand_initOptions = function _PlannerTaskRemoveCommand_initOptions() {
-    this.options.unshift({ option: '-i, --id [id]' }, { option: '-t, --title [title]' }, { option: '--bucketId [bucketId]' }, { option: '--bucketName [bucketName]' }, { option: '--planId [planId]' }, { option: '--planTitle [planTitle]' }, { option: '--ownerGroupId [ownerGroupId]' }, { option: '--ownerGroupName [ownerGroupName]' }, { option: '-f, --force' });
+    this.options.unshift({ option: '-i, --id [id]' }, { option: '-t, --title [title]' }, { option: '--bucketId [bucketId]' }, { option: '--bucketName [bucketName]' }, { option: '--planId [planId]' }, { option: '--planTitle [planTitle]' }, { option: '--rosterId [rosterId]' }, { option: '--ownerGroupId [ownerGroupId]' }, { option: '--ownerGroupName [ownerGroupName]' }, { option: '-f, --force' });
 }, _PlannerTaskRemoveCommand_initValidators = function _PlannerTaskRemoveCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.id) {
-            if (args.options.bucketId || args.options.bucketName || args.options.planId || args.options.planTitle || args.options.ownerGroupId || args.options.ownerGroupName) {
-                return 'Don\'t specify bucketId,bucketName, planId, planTitle, ownerGroupId or ownerGroupName when using id';
+            if (args.options.bucketId || args.options.bucketName ||
+                args.options.planId || args.options.planTitle || args.options.rosterId ||
+                args.options.ownerGroupId || args.options.ownerGroupName) {
+                return 'Don\'t specify bucketId,bucketName, planId, planTitle, rosterId, ownerGroupId, or ownerGroupName when using id';
             }
         }
-        if (args.options.title) {
-            if (!args.options.bucketId && !args.options.bucketName) {
-                return 'Specify either bucketId or bucketName when using title';
-            }
-            if (args.options.bucketId && args.options.bucketName) {
-                return 'Specify either bucketId or bucketName when using title but not both';
-            }
-            if (args.options.bucketName) {
-                if (!args.options.planId && !args.options.planTitle) {
-                    return 'Specify either planId or planTitle when using bucketName';
-                }
-                if (args.options.planId && args.options.planTitle) {
-                    return 'Specify either planId or planTitle when using bucketName but not both';
-                }
-            }
-            if (args.options.planTitle) {
-                if (!args.options.ownerGroupId && !args.options.ownerGroupName) {
-                    return 'Specify either ownerGroupId or ownerGroupName when using planTitle';
-                }
-                if (args.options.ownerGroupId && args.options.ownerGroupName) {
-                    return 'Specify either ownerGroupId or ownerGroupName when using planTitle but not both';
-                }
-            }
-            if (args.options.ownerGroupId && !validation.isValidGuid(args.options.ownerGroupId)) {
-                return `${args.options.ownerGroupId} is not a valid GUID`;
-            }
+        if (args.options.ownerGroupId && !validation.isValidGuid(args.options.ownerGroupId)) {
+            return `${args.options.ownerGroupId} is not a valid GUID`;
         }
         return true;
     });
 }, _PlannerTaskRemoveCommand_initOptionSets = function _PlannerTaskRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'title'] });
+    this.optionSets.push({ options: ['id', 'title'] }, {
+        options: ['planId', 'planTitle', 'rosterId'],
+        runsWhen: (args) => {
+            return args.options.id === undefined;
+        }
+    }, {
+        options: ['bucketId', 'bucketName'],
+        runsWhen: (args) => {
+            return args.options.title !== undefined;
+        }
+    }, {
+        options: ['planId', 'planTitle'],
+        runsWhen: (args) => {
+            return args.options.bucketName !== undefined && args.options.rosterId === undefined;
+        }
+    }, {
+        options: ['ownerGroupId', 'ownerGroupName'],
+        runsWhen: (args) => {
+            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;
+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';
@@ -26,6 +26,8 @@ class PlannerTaskSetCommand extends GraphCommand {
         __classPrivateFieldGet(this, _PlannerTaskSetCommand_instances, "m", _PlannerTaskSetCommand_initTelemetry).call(this);
         __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 {
@@ -170,9 +172,15 @@ class PlannerTaskSetCommand extends GraphCommand {
         if (options.planId) {
             return options.planId;
         }
-        const groupId = await this.getGroupId(options);
-        const plan = await planner.getPlanByTitle(options.planTitle, groupId);
-        return plan.id;
+        if (options.rosterId) {
+            const plan = await planner.getPlanByRosterId(options.rosterId);
+            return plan.id;
+        }
+        else {
+            const groupId = await this.getGroupId(options);
+            const plan = await planner.getPlanByTitle(options.planTitle, groupId);
+            return plan.id;
+        }
     }
     async getGroupId(options) {
         if (options.ownerGroupId) {
@@ -222,6 +230,7 @@ _PlannerTaskSetCommand_instances = new WeakSet(), _PlannerTaskSetCommand_initTel
             title: typeof args.options.title !== 'undefined',
             planId: typeof args.options.planId !== 'undefined',
             planTitle: typeof args.options.planTitle !== 'undefined',
+            rosterId: typeof args.options.rosterId !== 'undefined',
             ownerGroupId: typeof args.options.ownerGroupId !== 'undefined',
             ownerGroupName: typeof args.options.ownerGroupName !== 'undefined',
             bucketId: typeof args.options.bucketId !== 'undefined',
@@ -239,24 +248,9 @@ _PlannerTaskSetCommand_instances = new WeakSet(), _PlannerTaskSetCommand_initTel
         });
     });
 }, _PlannerTaskSetCommand_initOptions = function _PlannerTaskSetCommand_initOptions() {
-    this.options.unshift({ option: '-i, --id <id>' }, { option: '-t, --title [title]' }, { option: '--planId [planId]' }, { option: '--planTitle [planTitle]' }, { option: '--ownerGroupId [ownerGroupId]' }, { option: '--ownerGroupName [ownerGroupName]' }, { option: '--bucketId [bucketId]' }, { option: '--bucketName [bucketName]' }, { option: '--startDateTime [startDateTime]' }, { option: '--dueDateTime [dueDateTime]' }, { option: '--percentComplete [percentComplete]' }, { option: '--assignedToUserIds [assignedToUserIds]' }, { option: '--assignedToUserNames [assignedToUserNames]' }, { option: '--assigneePriority [assigneePriority]' }, { option: '--description [description]' }, { option: '--appliedCategories [appliedCategories]' }, { option: '--orderHint [orderHint]' }, { option: '--priority [priority]', autocomplete: taskPriority.priorityValues });
+    this.options.unshift({ option: '-i, --id <id>' }, { option: '-t, --title [title]' }, { option: '--planId [planId]' }, { option: '--planTitle [planTitle]' }, { option: '--rosterId [rosterId]' }, { option: '--ownerGroupId [ownerGroupId]' }, { option: '--ownerGroupName [ownerGroupName]' }, { option: '--bucketId [bucketId]' }, { option: '--bucketName [bucketName]' }, { option: '--startDateTime [startDateTime]' }, { option: '--dueDateTime [dueDateTime]' }, { option: '--percentComplete [percentComplete]' }, { option: '--assignedToUserIds [assignedToUserIds]' }, { option: '--assignedToUserNames [assignedToUserNames]' }, { option: '--assigneePriority [assigneePriority]' }, { option: '--description [description]' }, { option: '--appliedCategories [appliedCategories]' }, { option: '--orderHint [orderHint]' }, { option: '--priority [priority]', autocomplete: taskPriority.priorityValues });
 }, _PlannerTaskSetCommand_initValidators = function _PlannerTaskSetCommand_initValidators() {
     this.validators.push(async (args) => {
-        if (args.options.bucketId && args.options.bucketName) {
-            return 'Specify either bucketId or bucketName but not both';
-        }
-        if (args.options.bucketName && !args.options.planId && !args.options.planTitle) {
-            return 'Specify either planId or planTitle when using bucketName';
-        }
-        if (args.options.bucketName && args.options.planId && args.options.planTitle) {
-            return 'Specify either planId or planTitle when using bucketName but not both';
-        }
-        if (args.options.planTitle && !args.options.ownerGroupId && !args.options.ownerGroupName) {
-            return 'Specify either ownerGroupId or ownerGroupName when using planTitle';
-        }
-        if (args.options.planTitle && args.options.ownerGroupId && args.options.ownerGroupName) {
-            return 'Specify either ownerGroupId or ownerGroupName when using planTitle but not both';
-        }
         if (args.options.ownerGroupId && !validation.isValidGuid(args.options.ownerGroupId)) {
             return `${args.options.ownerGroupId} is not a valid GUID`;
         }
@@ -275,9 +269,6 @@ _PlannerTaskSetCommand_instances = new WeakSet(), _PlannerTaskSetCommand_initTel
         if (args.options.assignedToUserIds && !validation.isValidGuidArray(args.options.assignedToUserIds.split(','))) {
             return 'assignedToUserIds contains invalid GUID';
         }
-        if (args.options.assignedToUserIds && args.options.assignedToUserNames) {
-            return 'Specify either assignedToUserIds or assignedToUserNames but not both';
-        }
         if (args.options.appliedCategories && args.options.appliedCategories.split(',').filter(category => this.allowedAppliedCategories.indexOf(category.toLocaleLowerCase()) < 0).length !== 0) {
             return 'The appliedCategories contains invalid value. Specify either category1, category2, category3, category4, category5 and/or category6 as properties';
         }
@@ -293,6 +284,30 @@ _PlannerTaskSetCommand_instances = new WeakSet(), _PlannerTaskSetCommand_initTel
         }
         return true;
     });
+}, _PlannerTaskSetCommand_initOptionSets = function _PlannerTaskSetCommand_initOptionSets() {
+    this.optionSets.push({
+        options: ['bucketId', 'bucketName'],
+        runsWhen: (args) => {
+            return args.options.bucketId || args.options.bucketName;
+        }
+    }, {
+        options: ['planId', 'planTitle', 'rosterId'],
+        runsWhen: (args) => {
+            return args.options.bucketName !== undefined;
+        }
+    }, {
+        options: ['ownerGroupId', 'ownerGroupName'],
+        runsWhen: (args) => {
+            return args.options.planTitle !== undefined;
+        }
+    }, {
+        options: ['assignedToUserIds', 'assignedToUserNames'],
+        runsWhen: (args) => {
+            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/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/purview/commands/retentionlabel/retentionlabel-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 _PurviewRetentionLabelAddCommand_instances, _PurviewRetentionLabelAddCommand_initTelemetry, _PurviewRetentionLabelAddCommand_initOptions, _PurviewRetentionLabelAddCommand_initValidators, _PurviewRetentionLabelAddCommand_initOptionSets;
+var _PurviewRetentionLabelAddCommand_instances, _a, _PurviewRetentionLabelAddCommand_initTelemetry, _PurviewRetentionLabelAddCommand_initOptions, _PurviewRetentionLabelAddCommand_initValidators, _PurviewRetentionLabelAddCommand_initOptionSets;
 import request from '../../../../request.js';
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
@@ -90,7 +90,7 @@ class PurviewRetentionLabelAddCommand extends GraphCommand {
         return filteredEventTypes[0].id;
     }
 }
-_PurviewRetentionLabelAddCommand_instances = new WeakSet(), _PurviewRetentionLabelAddCommand_initTelemetry = function _PurviewRetentionLabelAddCommand_initTelemetry() {
+_a = PurviewRetentionLabelAddCommand, _PurviewRetentionLabelAddCommand_instances = new WeakSet(), _PurviewRetentionLabelAddCommand_initTelemetry = function _PurviewRetentionLabelAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             retentionTrigger: typeof args.options.retentionTrigger !== 'undefined',
@@ -107,18 +107,18 @@ _PurviewRetentionLabelAddCommand_instances = new WeakSet(), _PurviewRetentionLab
         option: '-n, --displayName <displayName>'
     }, {
         option: '--behaviorDuringRetentionPeriod <behaviorDuringRetentionPeriod>',
-        autocomplete: PurviewRetentionLabelAddCommand.behaviorDuringRetentionPeriods
+        autocomplete: _a.behaviorDuringRetentionPeriods
     }, {
         option: '--actionAfterRetentionPeriod <actionAfterRetentionPeriod>',
-        autocomplete: PurviewRetentionLabelAddCommand.actionAfterRetentionPeriods
+        autocomplete: _a.actionAfterRetentionPeriods
     }, {
         option: '--retentionDuration <retentionDuration>'
     }, {
         option: '-t, --retentionTrigger [retentionTrigger]',
-        autocomplete: PurviewRetentionLabelAddCommand.retentionTriggers
+        autocomplete: _a.retentionTriggers
     }, {
         option: '--defaultRecordBehavior [defaultRecordBehavior]',
-        autocomplete: PurviewRetentionLabelAddCommand.defaultRecordBehavior
+        autocomplete: _a.defaultRecordBehavior
     }, {
         option: '--descriptionForUsers [descriptionForUsers]'
     }, {
@@ -135,19 +135,19 @@ _PurviewRetentionLabelAddCommand_instances = new WeakSet(), _PurviewRetentionLab
         if (isNaN(args.options.retentionDuration)) {
             return `Specified retentionDuration ${args.options.retentionDuration} is not a number`;
         }
-        if (PurviewRetentionLabelAddCommand.behaviorDuringRetentionPeriods.indexOf(args.options.behaviorDuringRetentionPeriod) === -1) {
-            return `${args.options.behaviorDuringRetentionPeriod} is not a valid behavior of a document with the label. Allowed values are ${PurviewRetentionLabelAddCommand.behaviorDuringRetentionPeriods.join(', ')}`;
+        if (_a.behaviorDuringRetentionPeriods.indexOf(args.options.behaviorDuringRetentionPeriod) === -1) {
+            return `${args.options.behaviorDuringRetentionPeriod} is not a valid behavior of a document with the label. Allowed values are ${_a.behaviorDuringRetentionPeriods.join(', ')}`;
         }
-        if (PurviewRetentionLabelAddCommand.actionAfterRetentionPeriods.indexOf(args.options.actionAfterRetentionPeriod) === -1) {
-            return `${args.options.actionAfterRetentionPeriod} is not a valid action to take on a document with the label. Allowed values are ${PurviewRetentionLabelAddCommand.actionAfterRetentionPeriods.join(', ')}`;
+        if (_a.actionAfterRetentionPeriods.indexOf(args.options.actionAfterRetentionPeriod) === -1) {
+            return `${args.options.actionAfterRetentionPeriod} is not a valid action to take on a document with the label. Allowed values are ${_a.actionAfterRetentionPeriods.join(', ')}`;
         }
         if (args.options.retentionTrigger &&
-            PurviewRetentionLabelAddCommand.retentionTriggers.indexOf(args.options.retentionTrigger) === -1) {
-            return `${args.options.retentionTrigger} is not a valid action retention duration calculation. Allowed values are ${PurviewRetentionLabelAddCommand.retentionTriggers.join(', ')}`;
+            _a.retentionTriggers.indexOf(args.options.retentionTrigger) === -1) {
+            return `${args.options.retentionTrigger} is not a valid action retention duration calculation. Allowed values are ${_a.retentionTriggers.join(', ')}`;
         }
         if (args.options.defaultRecordBehavior &&
-            PurviewRetentionLabelAddCommand.defaultRecordBehavior.indexOf(args.options.defaultRecordBehavior) === -1) {
-            return `${args.options.defaultRecordBehavior} is not a valid state of a record label. Allowed values are ${PurviewRetentionLabelAddCommand.defaultRecordBehavior.join(', ')}`;
+            _a.defaultRecordBehavior.indexOf(args.options.defaultRecordBehavior) === -1) {
+            return `${args.options.defaultRecordBehavior} is not a valid state of a record label. Allowed values are ${_a.defaultRecordBehavior.join(', ')}`;
         }
         return true;
     });

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/package/package-generate.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 _SpfxPackageGenerateCommand_instances, _SpfxPackageGenerateCommand_initTelemetry, _SpfxPackageGenerateCommand_initOptions, _SpfxPackageGenerateCommand_initValidators;
+var _SpfxPackageGenerateCommand_instances, _a, _SpfxPackageGenerateCommand_initTelemetry, _SpfxPackageGenerateCommand_initOptions, _SpfxPackageGenerateCommand_initValidators;
 import AdmZip from 'adm-zip';
 import fs from 'fs';
 import os from 'os';
@@ -37,7 +37,7 @@ class SpfxPackageGenerateCommand extends AnonymousCommand {
             supportedHosts.push('TeamsPersonalApp');
         }
         const tokens = {
-            clientSideAssetsFeatureId: SpfxPackageGenerateCommand.generateNewId(),
+            clientSideAssetsFeatureId: _a.generateNewId(),
             developerName: args.options.developerName || 'Contoso',
             developerWebsiteUrl: args.options.developerWebsiteUrl || 'https://contoso.com/my-app',
             developerPrivacyUrl: args.options.developerPrivacyUrl || 'https://contoso.com/privacy',
@@ -46,18 +46,18 @@ class SpfxPackageGenerateCommand extends AnonymousCommand {
             exposePageContextGlobally: args.options.exposePageContextGlobally ? '!0' : '!1',
             exposeTeamsContextGlobally: args.options.exposeTeamsContextGlobally ? '!0' : '!1',
             html: args.options.html.replace(/"/g, '\\"').replace(/\r\n/g, ' ').replace(/\n/g, ' '),
-            packageName: SpfxPackageGenerateCommand.getSafePackageName(args.options.webPartTitle),
-            productId: SpfxPackageGenerateCommand.generateNewId(),
+            packageName: _a.getSafePackageName(args.options.webPartTitle),
+            productId: _a.generateNewId(),
             skipFeatureDeployment: (args.options.allowTenantWideDeployment === true).toString(),
             supportedHosts: JSON.stringify(supportedHosts).replace(/"/g, '"'),
-            webPartId: SpfxPackageGenerateCommand.generateNewId(),
+            webPartId: _a.generateNewId(),
             webPartFeatureName: `${args.options.webPartTitle} Feature`,
             webPartFeatureDescription: `A feature which activates the Client-Side WebPart named ${args.options.webPartTitle}`,
-            webPartAlias: SpfxPackageGenerateCommand.getWebPartAlias(args.options.webPartTitle),
+            webPartAlias: _a.getWebPartAlias(args.options.webPartTitle),
             webPartName: args.options.webPartTitle,
-            webPartSafeName: SpfxPackageGenerateCommand.getSafeWebPartName(args.options.webPartTitle),
+            webPartSafeName: _a.getSafeWebPartName(args.options.webPartTitle),
             webPartDescription: args.options.webPartDescription,
-            webPartModule: SpfxPackageGenerateCommand.getSafePackageName(args.options.webPartTitle)
+            webPartModule: _a.getSafePackageName(args.options.webPartTitle)
         };
         let tmpDir = undefined;
         let error;
@@ -73,7 +73,7 @@ class SpfxPackageGenerateCommand extends AnonymousCommand {
                 await logger.log('Copying files...');
             }
             const src = path.join(__dirname, 'package-generate', 'assets');
-            fsUtil.copyRecursiveSync(src, tmpDir, s => SpfxPackageGenerateCommand.replaceTokens(s, tokens));
+            fsUtil.copyRecursiveSync(src, tmpDir, s => _a.replaceTokens(s, tokens));
             const files = fsUtil.readdirR(tmpDir);
             if (this.verbose) {
                 await logger.log('Processing files...');
@@ -82,7 +82,7 @@ class SpfxPackageGenerateCommand extends AnonymousCommand {
                 if (this.debug) {
                     await logger.log(`Processing ${filePath}...`);
                 }
-                if (!SpfxPackageGenerateCommand.isBinaryFile(filePath)) {
+                if (!_a.isBinaryFile(filePath)) {
                     if (this.verbose) {
                         await logger.log('Replacing tokens...');
                     }
@@ -91,7 +91,7 @@ class SpfxPackageGenerateCommand extends AnonymousCommand {
                         await logger.log('Before:');
                         await logger.log(fileContents);
                     }
-                    fileContents = SpfxPackageGenerateCommand.replaceTokens(fileContents, tokens);
+                    fileContents = _a.replaceTokens(fileContents, tokens);
                     if (this.debug) {
                         await logger.log('After:');
                         await logger.log(fileContents);
@@ -170,7 +170,7 @@ class SpfxPackageGenerateCommand extends AnonymousCommand {
         return 'AutoWP' + webPartName.replace(/[^a-zA-Z0-9]/g, '').substr(0, 40);
     }
 }
-_SpfxPackageGenerateCommand_instances = new WeakSet(), _SpfxPackageGenerateCommand_initTelemetry = function _SpfxPackageGenerateCommand_initTelemetry() {
+_a = SpfxPackageGenerateCommand, _SpfxPackageGenerateCommand_instances = new WeakSet(), _SpfxPackageGenerateCommand_initTelemetry = function _SpfxPackageGenerateCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             allowTenantWideDeployment: args.options.allowTenantWideDeployment === true,
@@ -187,13 +187,13 @@ _SpfxPackageGenerateCommand_instances = new WeakSet(), _SpfxPackageGenerateComma
 }, _SpfxPackageGenerateCommand_initOptions = function _SpfxPackageGenerateCommand_initOptions() {
     this.options.unshift({ option: '-t, --webPartTitle <webPartTitle>' }, { option: '-d, --webPartDescription <webPartDescription>' }, { option: '-n, --name <name>' }, { option: '--html <html>' }, {
         option: '--enableForTeams [enableForTeams]',
-        autocomplete: SpfxPackageGenerateCommand.enableForTeamsOptions
+        autocomplete: _a.enableForTeamsOptions
     }, { option: '--exposePageContextGlobally' }, { option: '--exposeTeamsContextGlobally' }, { option: '--allowTenantWideDeployment' }, { option: '--developerName [developerName]' }, { option: '--developerPrivacyUrl [developerPrivacyUrl]' }, { option: '--developerTermsOfUseUrl [developerTermsOfUseUrl]' }, { option: '--developerWebsiteUrl [developerWebsiteUrl]' }, { option: '--developerMpnId [developerMpnId]' });
 }, _SpfxPackageGenerateCommand_initValidators = function _SpfxPackageGenerateCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.enableForTeams &&
-            SpfxPackageGenerateCommand.enableForTeamsOptions.indexOf(args.options.enableForTeams) < 0) {
-            return `${args.options.enableForTeams} is not a valid value for enableForTeams. Allowed values are: ${SpfxPackageGenerateCommand.enableForTeamsOptions.join(', ')}`;
+            _a.enableForTeamsOptions.indexOf(args.options.enableForTeams) < 0) {
+            return `${args.options.enableForTeams} is not a valid value for enableForTeams. Allowed values are: ${_a.enableForTeamsOptions.join(', ')}`;
         }
         return true;
     });

package/dist/m365/spfx/commands/project/DeployWorkflow.js

@@ -0,0 +1,55 @@
+export const workflow = {
+    name: "Deploy Solution {{ name }}",
+    on: {
+        push: {
+            branches: [
+                "main"
+            ]
+        }
+    },
+    jobs: {
+        "build-and-deploy": {
+            "runs-on": "ubuntu-latest",
+            steps: [
+                {
+                    name: "Checkout",
+                    uses: "actions/checkout@v3.5.3"
+                },
+                {
+                    name: "Use Node.js 16.x",
+                    uses: "actions/setup-node@v3.7.0",
+                    with: {
+                        "node-version": "16.x"
+                    }
+                },
+                {
+                    name: "Run npm ci",
+                    run: "npm ci"
+                },
+                {
+                    name: "Bundle & Package",
+                    run: "gulp bundle --ship\ngulp package-solution --ship\n"
+                },
+                {
+                    name: "CLI for Microsoft 365 Login",
+                    uses: "pnp/action-cli-login@v2.2.2",
+                    with: {
+                        "CERTIFICATE_ENCODED": "${{ secrets.CERTIFICATE_ENCODED }}",
+                        "CERTIFICATE_PASSWORD": "${{ secrets.CERTIFICATE_PASSWORD }}",
+                        "APP_ID": "${{ secrets.APP_ID }}"
+                    }
+                },
+                {
+                    name: "CLI for Microsoft 365 Deploy App",
+                    uses: "pnp/action-cli-deploy@v3.0.1",
+                    with: {
+                        "APP_FILE_PATH": "sharepoint/solution/{{ solutionName }}.sppkg",
+                        "SKIP_FEATURE_DEPLOYMENT": false,
+                        "OVERWRITE": false
+                    }
+                }
+            ]
+        }
+    }
+};
+//# sourceMappingURL=DeployWorkflow.js.map

package/dist/m365/spfx/commands/project/project-doctor/{doctor-1.18.0-beta.1.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.1.js.map
+//# sourceMappingURL=doctor-1.18.0.js.map