@pnp/cli-microsoft365 11.8.0 → 11.9.0-beta.16abf04

package/dist/m365/exo/commands/approleassignment/approleassignment-add.js

@@ -39,20 +39,36 @@ class ExoAppRoleAssignmentAddCommand extends GraphCommand {
     getRefinedSchema(schema) {
         return schema
             .refine(options => !options.roleDefinitionId !== !options.roleDefinitionName, {
-            error: 'Specify either roleDefinitionId or roleDefinitionName, but not both'
+            error: 'Specify either roleDefinitionId or roleDefinitionName, but not both',
+            params: {
+                customCode: 'optionSet',
+                options: ['roleDefinitionId', 'roleDefinitionName']
+            }
         })
             .refine(options => options.roleDefinitionId || options.roleDefinitionName, {
-            error: 'Specify either roleDefinitionId or roleDefinitionName'
+            error: 'Specify either roleDefinitionId or roleDefinitionName',
+            params: {
+                customCode: 'optionSet',
+                options: ['roleDefinitionId', 'roleDefinitionName']
+            }
         })
             .refine(options => (!options.roleDefinitionId && !options.roleDefinitionName) || options.roleDefinitionName || (options.roleDefinitionId && validation.isValidGuid(options.roleDefinitionId)), {
             error: e => `The '${e.input}' must be a valid GUID`,
             path: ['roleDefinitionId']
         })
             .refine(options => !options.principalId !== !options.principalName, {
-            error: 'Specify either principalId or principalName, but not both'
+            error: 'Specify either principalId or principalName, but not both',
+            params: {
+                customCode: 'optionSet',
+                options: ['principalId', 'principalName']
+            }
         })
             .refine(options => options.principalId || options.principalName, {
-            error: 'Specify either principalId or principalName'
+            error: 'Specify either principalId or principalName',
+            params: {
+                customCode: 'optionSet',
+                options: ['principalId', 'principalName']
+            }
         })
             .refine(options => (!options.principalId && !options.principalName) || options.principalName || (options.principalId && validation.isValidGuid(options.principalId)), {
             error: e => `The '${e.input}' must be a valid GUID`,
@@ -68,11 +84,19 @@ class ExoAppRoleAssignmentAddCommand extends GraphCommand {
         })
             .refine(options => options.scope !== 'user' || (!options.userId !== !options.userName), {
             message: "When the scope is set to 'user' specify either userId or userName, but not both",
-            path: ['scope']
+            path: ['scope'],
+            params: {
+                customCode: 'optionSet',
+                options: ['userId', 'userName']
+            }
         })
             .refine(options => options.scope !== 'user' || (options.userId || options.userName), {
             message: "When the scope is set to 'user' specify either userId or userName",
-            path: ['scope']
+            path: ['scope'],
+            params: {
+                customCode: 'optionSet',
+                options: ['userId', 'userName']
+            }
         })
             .refine(options => options.scope !== 'user' || (!options.userId && !options.userName) || options.userName || (options.userId && validation.isValidGuid(options.userId)), {
             error: e => `The '${e.input}' must be a valid GUID`,
@@ -88,11 +112,19 @@ class ExoAppRoleAssignmentAddCommand extends GraphCommand {
         })
             .refine(options => options.scope !== 'group' || (!options.groupId !== !options.groupName), {
             message: "When the scope is set to 'group' specify either groupId or groupName, but not both",
-            path: ['scope']
+            path: ['scope'],
+            params: {
+                customCode: 'optionSet',
+                options: ['groupId', 'groupName']
+            }
         })
             .refine(options => options.scope !== 'group' || (options.groupId || options.groupName), {
             message: "When the scope is set to 'group' specify either groupId or groupName",
-            path: ['scope']
+            path: ['scope'],
+            params: {
+                customCode: 'optionSet',
+                options: ['groupId', 'groupName']
+            }
         })
             .refine(options => options.scope !== 'group' || (!options.groupId && !options.groupName) || options.groupName || (options.groupId && validation.isValidGuid(options.groupId)), {
             error: e => `The '${e.input}' must be a valid GUID`,
@@ -104,11 +136,19 @@ class ExoAppRoleAssignmentAddCommand extends GraphCommand {
         })
             .refine(options => options.scope !== 'administrativeUnit' || (!options.administrativeUnitId !== !options.administrativeUnitName), {
             message: "When the scope is set to 'administrativeUnit' specify either administrativeUnitId or administrativeUnitName, but not both",
-            path: ['scope']
+            path: ['scope'],
+            params: {
+                customCode: 'optionSet',
+                options: ['administrativeUnitId', 'administrativeUnitName']
+            }
         })
             .refine(options => options.scope !== 'administrativeUnit' || (options.administrativeUnitId || options.administrativeUnitName), {
             message: "When the scope is set to 'administrativeUnit' specify either administrativeUnitId or administrativeUnitName",
-            path: ['scope']
+            path: ['scope'],
+            params: {
+                customCode: 'optionSet',
+                options: ['administrativeUnitId', 'administrativeUnitName']
+            }
         })
             .refine(options => options.scope !== 'administrativeUnit' || (!options.administrativeUnitId && !options.administrativeUnitName) || options.administrativeUnitName || (options.administrativeUnitId && validation.isValidGuid(options.administrativeUnitId)), {
             error: e => `The '${e.input}' must be a valid GUID`,
@@ -120,11 +160,19 @@ class ExoAppRoleAssignmentAddCommand extends GraphCommand {
         })
             .refine(options => options.scope !== 'custom' || (!options.customAppScopeId !== !options.customAppScopeName), {
             message: "When the scope is set to 'custom' specify either customAppScopeId or customAppScopeName, but not both",
-            path: ['scope']
+            path: ['scope'],
+            params: {
+                customCode: 'optionSet',
+                options: ['customAppScopeId', 'customAppScopeName']
+            }
         })
             .refine(options => options.scope !== 'custom' || (options.customAppScopeId || options.customAppScopeName), {
             message: "When the scope is set to 'custom' specify either customAppScopeId or customAppScopeName",
-            path: ['scope']
+            path: ['scope'],
+            params: {
+                customCode: 'optionSet',
+                options: ['customAppScopeId', 'customAppScopeName']
+            }
         })
             .refine(options => options.scope !== 'custom' || (!options.customAppScopeId && !options.customAppScopeName) || options.customAppScopeName || (options.customAppScopeId && validation.isValidGuid(options.customAppScopeId)), {
             error: e => `The '${e.input}' must be a valid GUID`,

package/dist/m365/flow/commands/environment/environment-get.js

@@ -22,7 +22,11 @@ class FlowEnvironmentGetCommand extends PowerAutomateCommand {
     getRefinedSchema(schema) {
         return schema
             .refine(options => !!options.name !== !!options.default, {
-            error: `Specify either name or default, but not both.`
+            error: `Specify either name or default, but not both.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['name', 'default']
+            }
         });
     }
     async commandAction(logger, args) {

package/dist/m365/graph/commands/directoryextension/directoryextension-add.js

@@ -29,7 +29,11 @@ class GraphDirectoryExtensionAddCommand extends GraphCommand {
     getRefinedSchema(schema) {
         return schema
             .refine(options => Object.values([options.appId, options.appObjectId, options.appName]).filter(v => typeof v !== 'undefined').length === 1, {
-            error: 'Specify either appId, appObjectId or appName, but not multiple'
+            error: 'Specify either appId, appObjectId or appName, but not multiple',
+            params: {
+                customCode: 'optionSet',
+                options: ['appId', 'appObjectId', 'appName']
+            }
         })
             .refine(options => (!options.appId && !options.appObjectId && !options.appName) || options.appObjectId || options.appName ||
             (options.appId && validation.isValidGuid(options.appId)), {

package/dist/m365/graph/commands/directoryextension/directoryextension-get.js

@@ -26,13 +26,25 @@ class GraphDirectoryExtensionGetCommand extends GraphCommand {
     getRefinedSchema(schema) {
         return schema
             .refine(options => !options.id !== !options.name, {
-            error: 'Specify either id or name, but not both'
+            error: 'Specify either id or name, but not both',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'name']
+            }
         })
             .refine(options => options.id || options.name, {
-            error: 'Specify either id or name'
+            error: 'Specify either id or name',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'name']
+            }
         })
             .refine(options => Object.values([options.appId, options.appObjectId, options.appName]).filter(v => typeof v !== 'undefined').length === 1, {
-            error: 'Specify either appId, appObjectId or appName, but not multiple'
+            error: 'Specify either appId, appObjectId or appName, but not multiple',
+            params: {
+                customCode: 'optionSet',
+                options: ['appId', 'appObjectId', 'appName']
+            }
         });
     }
     async commandAction(logger, args) {

package/dist/m365/graph/commands/directoryextension/directoryextension-list.js

@@ -27,7 +27,11 @@ class GraphDirectoryExtensionListCommand extends GraphCommand {
     getRefinedSchema(schema) {
         return schema
             .refine(options => ([options.appId, options.appObjectId, options.appName].filter(x => x !== undefined).length <= 1), {
-            error: 'Specify either appId, appObjectId, or appName, but not multiple.'
+            error: 'Specify either appId, appObjectId, or appName, but not multiple.',
+            params: {
+                customCode: 'optionSet',
+                options: ['appId', 'appObjectId', 'appName']
+            }
         });
     }
     async commandAction(logger, args) {

package/dist/m365/graph/commands/directoryextension/directoryextension-remove.js

@@ -28,13 +28,25 @@ class GraphDirectoryExtensionRemoveCommand extends GraphCommand {
     getRefinedSchema(schema) {
         return schema
             .refine(options => !options.id !== !options.name, {
-            error: 'Specify either id or name, but not both'
+            error: 'Specify either id or name, but not both',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'name']
+            }
         })
             .refine(options => options.id || options.name, {
-            error: 'Specify either id or name'
+            error: 'Specify either id or name',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'name']
+            }
         })
             .refine(options => Object.values([options.appId, options.appObjectId, options.appName]).filter(v => typeof v !== 'undefined').length === 1, {
-            error: 'Specify either appId, appObjectId or appName, but not multiple'
+            error: 'Specify either appId, appObjectId or appName, but not multiple',
+            params: {
+                customCode: 'optionSet',
+                options: ['appId', 'appObjectId', 'appName']
+            }
         });
     }
     async commandAction(logger, args) {

package/dist/m365/outlook/commands/calendar/calendar-get.js

@@ -35,7 +35,7 @@ class OutlookCalendarGetCommand extends GraphCommand {
             .refine(options => [options.id, options.name].filter(x => x !== undefined).length === 1, {
             error: 'Specify either id or name, but not both'
         })
-            .refine(options => !(options.userId && options.userName), {
+            .refine(options => [options.userId, options.userName].filter(x => x !== undefined).length === 1, {
             error: 'Specify either userId or userName, but not both'
         })
             .refine(options => !(options.calendarGroupId && options.calendarGroupName), {

package/dist/m365/outlook/commands/mail/mail-searchfolder-add.js

@@ -31,7 +31,11 @@ class OutlookMailSearchFolderAddCommand extends GraphCommand {
     getRefinedSchema(schema) {
         return schema
             .refine(options => !(options.userId && options.userName), {
-            error: 'Specify either userId or userName, but not both'
+            error: 'Specify either userId or userName, but not both',
+            params: {
+                customCode: 'optionSet',
+                options: ['userId', 'userName']
+            }
         });
     }
     async commandAction(logger, args) {

package/dist/m365/outlook/commands/mailbox/mailbox-settings-get.js

@@ -26,7 +26,11 @@ class OutlookMailboxSettingsGetCommand extends GraphCommand {
     getRefinedSchema(schema) {
         return schema
             .refine(options => !(options.userId && options.userName), {
-            error: 'Specify either userId or userName, but not both'
+            error: 'Specify either userId or userName, but not both',
+            params: {
+                customCode: 'optionSet',
+                options: ['userId', 'userName']
+            }
         });
     }
     async commandAction(logger, args) {

package/dist/m365/outlook/commands/mailbox/mailbox-settings-set.js

@@ -45,7 +45,11 @@ class OutlookMailboxSettingsSetCommand extends GraphCommand {
     getRefinedSchema(schema) {
         return schema
             .refine(options => !(options.userId && options.userName), {
-            error: 'Specify either userId or userName, but not both'
+            error: 'Specify either userId or userName, but not both',
+            params: {
+                customCode: 'optionSet',
+                options: ['userId', 'userName']
+            }
         })
             .refine(options => [
             options.workingDays, options.workingHoursStartTime, options.workingHoursEndTime, options.workingHoursTimeZone,
@@ -53,7 +57,10 @@ class OutlookMailboxSettingsSetCommand extends GraphCommand {
             options.autoReplyStartDateTime, options.autoReplyStartTimeZone, options.autoReplyEndDateTime, options.autoReplyEndTimeZone,
             options.timeFormat, options.timeZone, options.dateFormat, options.delegateMeetingMessageDeliveryOptions, options.language
         ].filter(o => o !== undefined).length > 0, {
-            error: 'Specify at least one of the following options: workingDays, workingHoursStartTime, workingHoursEndTime, workingHoursTimeZone, autoReplyStatus, autoReplyExternalAudience, autoReplyExternalMessage, autoReplyInternalMessage, autoReplyStartDateTime, autoReplyStartTimeZone, autoReplyEndDateTime, autoReplyEndTimeZone, timeFormat, timeZone, dateFormat, delegateMeetingMessageDeliveryOptions, or language'
+            error: 'Specify at least one of the following options: workingDays, workingHoursStartTime, workingHoursEndTime, workingHoursTimeZone, autoReplyStatus, autoReplyExternalAudience, autoReplyExternalMessage, autoReplyInternalMessage, autoReplyStartDateTime, autoReplyStartTimeZone, autoReplyEndDateTime, autoReplyEndTimeZone, timeFormat, timeZone, dateFormat, delegateMeetingMessageDeliveryOptions, or language',
+            params: {
+                customCode: 'required'
+            }
         });
     }
     async commandAction(logger, args) {

package/dist/m365/pa/commands/environment/environment-get.js

@@ -22,7 +22,11 @@ class PaEnvironmentGetCommand extends PowerAppsCommand {
     getRefinedSchema(schema) {
         return schema
             .refine(options => !!options.name !== !!options.default, {
-            error: `Specify either name or default, but not both.`
+            error: `Specify either name or default, but not both.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['name', 'default']
+            }
         });
     }
     async commandAction(logger, args) {

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

@@ -23,7 +23,11 @@ class PpEnvironmentGetCommand extends PowerPlatformCommand {
     getRefinedSchema(schema) {
         return schema
             .refine(options => !!options.name !== !!options.default, {
-            error: `Specify either name or default, but not both.`
+            error: `Specify either name or default, but not both.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['name', 'default']
+            }
         });
     }
     async commandAction(logger, args) {

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

@@ -28,7 +28,11 @@ class PpWebSiteGetCommand extends PowerPlatformCommand {
     getRefinedSchema(schema) {
         return schema
             .refine(options => [options.url, options.id, options.name].filter(x => x !== undefined).length === 1, {
-            error: `Specify either url, id or name, but not multiple.`
+            error: `Specify either url, id or name, but not multiple.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['url', 'id', 'name']
+            }
         });
     }
     async commandAction(logger, args) {

package/dist/m365/spe/commands/container/container-add.js

@@ -31,7 +31,11 @@ class SpeContainerAddCommand extends GraphCommand {
     getRefinedSchema(schema) {
         return schema
             .refine((options) => [options.containerTypeId, options.containerTypeName].filter(o => o !== undefined).length === 1, {
-            error: 'Use one of the following options: containerTypeId or containerTypeName.'
+            error: 'Use one of the following options: containerTypeId or containerTypeName.',
+            params: {
+                customCode: 'optionSet',
+                options: ['containerTypeId', 'containerTypeName']
+            }
         });
     }
     async commandAction(logger, args) {

package/dist/m365/spe/commands/container/container-get.js

@@ -1,12 +1,16 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _SpeContainerGetCommand_instances, _SpeContainerGetCommand_initOptions, _SpeContainerGetCommand_initTypes;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 import request from '../../../../request.js';
+import { spe } from '../../../../utils/spe.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    id: z.string().alias('i').optional(),
+    name: z.string().alias('n').optional(),
+    containerTypeId: z.uuid().optional(),
+    containerTypeName: z.string().optional()
+});
 class SpeContainerGetCommand extends GraphCommand {
     get name() {
         return commands.CONTAINER_GET;
@@ -14,24 +18,34 @@ class SpeContainerGetCommand extends GraphCommand {
     get description() {
         return 'Gets a container of a specific container type';
     }
-    constructor() {
-        super();
-        _SpeContainerGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpeContainerGetCommand_instances, "m", _SpeContainerGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpeContainerGetCommand_instances, "m", _SpeContainerGetCommand_initTypes).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine((opts) => [opts.id, opts.name].filter(value => value !== undefined).length === 1, {
+            message: 'Specify either id or name, but not both.'
+        })
+            .refine((options) => !options.name || [options.containerTypeId, options.containerTypeName].filter(o => o !== undefined).length === 1, {
+            error: 'Use one of the following options when specifying the container name: containerTypeId or containerTypeName.'
+        })
+            .refine((options) => options.name || [options.containerTypeId, options.containerTypeName].filter(o => o !== undefined).length === 0, {
+            error: 'Options containerTypeId and containerTypeName are only required when retrieving a container by name.'
+        });
     }
     async commandAction(logger, args) {
-        if (this.verbose) {
-            await logger.logToStderr(`Getting a container with id '${args.options.id}'...`);
-        }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/storage/fileStorage/containers/${args.options.id}`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
         try {
+            const containerId = await this.resolveContainerId(args.options, logger);
+            if (this.verbose) {
+                await logger.logToStderr(`Getting a container with id '${containerId}'...`);
+            }
+            const requestOptions = {
+                url: `${this.resource}/v1.0/storage/fileStorage/containers/${containerId}`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
             const res = await request.get(requestOptions);
             await logger.log(res);
         }
@@ -39,11 +53,25 @@ class SpeContainerGetCommand extends GraphCommand {
             this.handleRejectedODataJsonPromise(err);
         }
     }
+    async resolveContainerId(options, logger) {
+        if (options.id) {
+            return options.id;
+        }
+        if (this.verbose) {
+            await logger.logToStderr(`Resolving container id from name '${options.name}'...`);
+        }
+        const containerTypeId = await this.getContainerTypeId(options, logger);
+        return spe.getContainerIdByName(containerTypeId, options.name);
+    }
+    async getContainerTypeId(options, logger) {
+        if (options.containerTypeId) {
+            return options.containerTypeId;
+        }
+        if (this.verbose) {
+            await logger.logToStderr(`Getting container type with name '${options.containerTypeName}'...`);
+        }
+        return spe.getContainerTypeIdByName(options.containerTypeName);
+    }
 }
-_SpeContainerGetCommand_instances = new WeakSet(), _SpeContainerGetCommand_initOptions = function _SpeContainerGetCommand_initOptions() {
-    this.options.unshift({ option: '-i, --id <id>' });
-}, _SpeContainerGetCommand_initTypes = function _SpeContainerGetCommand_initTypes() {
-    this.types.string.push('id');
-};
 export default new SpeContainerGetCommand();
 //# sourceMappingURL=container-get.js.map

package/dist/m365/spe/commands/container/container-permission-list.js

@@ -1,13 +1,17 @@
 import { cli } from '../../../../cli/cli.js';
 import { z } from 'zod';
-import { globalOptionsZod } from '../../../../Command.js';
+import { CommandError, globalOptionsZod } from '../../../../Command.js';
 import commands from '../../commands.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import { odata } from '../../../../utils/odata.js';
 import { formatting } from '../../../../utils/formatting.js';
+import { spe } from '../../../../utils/spe.js';
 export const options = z.strictObject({
     ...globalOptionsZod.shape,
-    containerId: z.string().alias('i')
+    containerId: z.string().alias('i').optional(),
+    containerName: z.string().alias('n').optional(),
+    containerTypeId: z.uuid().optional(),
+    containerTypeName: z.string().optional()
 });
 class SpeContainerPermissionListCommand extends GraphCommand {
     get name() {
@@ -22,12 +26,25 @@ class SpeContainerPermissionListCommand extends GraphCommand {
     get schema() {
         return options;
     }
+    getRefinedSchema(schema) {
+        return schema
+            .refine((opts) => [opts.containerId, opts.containerName].filter(value => value !== undefined).length === 1, {
+            message: 'Specify either id or name, but not both.'
+        })
+            .refine((options) => !options.containerName || [options.containerTypeId, options.containerTypeName].filter(o => o !== undefined).length === 1, {
+            error: 'Use one of the following options when specifying the container name: containerTypeId or containerTypeName.'
+        })
+            .refine((options) => options.containerName || [options.containerTypeId, options.containerTypeName].filter(o => o !== undefined).length === 0, {
+            error: 'Options containerTypeId and containerTypeName are only required when retrieving a container by name.'
+        });
+    }
     async commandAction(logger, args) {
         try {
+            const containerId = await this.resolveContainerId(args.options, logger);
             if (this.verbose) {
-                await logger.logToStderr(`Retrieving permissions of a SharePoint Embedded Container with id '${args.options.containerId}'...`);
+                await logger.logToStderr(`Retrieving permissions of a SharePoint Embedded Container with id '${containerId}'...`);
             }
-            const containerPermission = await odata.getAllItems(`${this.resource}/v1.0/storage/fileStorage/containers/${formatting.encodeQueryParameter(args.options.containerId)}/permissions`);
+            const containerPermission = await odata.getAllItems(`${this.resource}/v1.0/storage/fileStorage/containers/${formatting.encodeQueryParameter(containerId)}/permissions`);
             if (!cli.shouldTrimOutput(args.options.output)) {
                 await logger.log(containerPermission);
             }
@@ -42,9 +59,31 @@ class SpeContainerPermissionListCommand extends GraphCommand {
             }
         }
         catch (err) {
+            if (err instanceof CommandError) {
+                throw err;
+            }
             this.handleRejectedODataJsonPromise(err);
         }
     }
+    async resolveContainerId(options, logger) {
+        if (options.containerId) {
+            return options.containerId;
+        }
+        if (this.verbose) {
+            await logger.logToStderr(`Resolving container id from name '${options.containerName}'...`);
+        }
+        const containerTypeId = await this.getContainerTypeId(options, logger);
+        return spe.getContainerIdByName(containerTypeId, options.containerName);
+    }
+    async getContainerTypeId(options, logger) {
+        if (options.containerTypeId) {
+            return options.containerTypeId;
+        }
+        if (this.verbose) {
+            await logger.logToStderr(`Getting container type with name '${options.containerTypeName}'...`);
+        }
+        return spe.getContainerTypeIdByName(options.containerTypeName);
+    }
 }
 export default new SpeContainerPermissionListCommand();
 //# sourceMappingURL=container-permission-list.js.map

package/dist/m365/spe/commands/container/container-recyclebinitem-list.js

@@ -25,7 +25,11 @@ class SpeContainerRecycleBinItemListCommand extends GraphCommand {
     getRefinedSchema(schema) {
         return schema
             .refine((options) => [options.containerTypeId, options.containerTypeName].filter(o => o !== undefined).length === 1, {
-            error: 'Use one of the following options: containerTypeId or containerTypeName.'
+            error: 'Use one of the following options: containerTypeId or containerTypeName.',
+            params: {
+                customCode: 'optionSet',
+                options: ['containerTypeId', 'containerTypeName']
+            }
         });
     }
     async commandAction(logger, args) {

package/dist/m365/spe/commands/container/container-recyclebinitem-remove.js

@@ -28,10 +28,18 @@ class SpeContainerRecycleBinItemRemoveCommand extends GraphCommand {
     getRefinedSchema(schema) {
         return schema
             .refine((options) => [options.id, options.name].filter(o => o !== undefined).length === 1, {
-            error: 'Use one of the following options: id or name.'
+            error: 'Use one of the following options: id or name.',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'name']
+            }
         })
             .refine((options) => !options.name || [options.containerTypeId, options.containerTypeName].filter(o => o !== undefined).length === 1, {
-            error: 'Use one of the following options when specifying the container name: containerTypeId or containerTypeName.'
+            error: 'Use one of the following options when specifying the container name: containerTypeId or containerTypeName.',
+            params: {
+                customCode: 'optionSet',
+                options: ['containerTypeId', 'containerTypeName']
+            }
         })
             .refine((options) => options.name || [options.containerTypeId, options.containerTypeName].filter(o => o !== undefined).length === 0, {
             error: 'Options containerTypeId and containerTypeName are only required when removing a container by name.'

package/dist/m365/spe/commands/container/container-recyclebinitem-restore.js

@@ -27,10 +27,18 @@ class SpeContainerRecycleBinItemRestoreCommand extends GraphCommand {
     getRefinedSchema(schema) {
         return schema
             .refine((options) => [options.id, options.name].filter(o => o !== undefined).length === 1, {
-            error: 'Use one of the following options: id or name.'
+            error: 'Use one of the following options: id or name.',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'name']
+            }
         })
             .refine((options) => !options.name || [options.containerTypeId, options.containerTypeName].filter(o => o !== undefined).length === 1, {
-            error: 'Use one of the following options when specifying the container name: containerTypeId or containerTypeName.'
+            error: 'Use one of the following options when specifying the container name: containerTypeId or containerTypeName.',
+            params: {
+                customCode: 'optionSet',
+                options: ['containerTypeId', 'containerTypeName']
+            }
         })
             .refine((options) => options.name || [options.containerTypeId, options.containerTypeName].filter(o => o !== undefined).length === 0, {
             error: 'Options containerTypeId and containerTypeName are only required when restoring a container by name.'

package/dist/m365/spe/commands/container/container-remove.js

@@ -27,10 +27,18 @@ class SpeContainerRemoveCommand extends GraphCommand {
     getRefinedSchema(schema) {
         return schema
             .refine((options) => [options.id, options.name].filter(o => o !== undefined).length === 1, {
-            error: 'Use one of the following options: id or name.'
+            error: 'Use one of the following options: id or name.',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'name']
+            }
         })
             .refine((options) => !options.name || [options.containerTypeId, options.containerTypeName].filter(o => o !== undefined).length === 1, {
-            error: 'Use one of the following options when specifying the container name: containerTypeId or containerTypeName.'
+            error: 'Use one of the following options when specifying the container name: containerTypeId or containerTypeName.',
+            params: {
+                customCode: 'optionSet',
+                options: ['containerTypeId', 'containerTypeName']
+            }
         })
             .refine((options) => options.name || [options.containerTypeId, options.containerTypeName].filter(o => o !== undefined).length === 0, {
             error: 'Options containerTypeId and containerTypeName are only required when deleting a container by name.'