@pnp/cli-microsoft365 11.4.0-beta.13d597c → 11.4.0-beta.37c2235

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

@@ -1,20 +1,19 @@
 import { z } from 'zod';
 import { globalOptionsZod } from '../../../../Command.js';
-import { zod } from '../../../../utils/zod.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 import { validation } from '../../../../utils/validation.js';
 import request from '../../../../request.js';
 import { accessToken } from '../../../../utils/accessToken.js';
 import auth from '../../../../Auth.js';
-const options = globalOptionsZod
-    .extend({
-    userId: zod.alias('i', z.string().refine(id => validation.isValidGuid(id), id => ({
-        message: `'${id}' is not a valid GUID.`
-    })).optional()),
-    userName: zod.alias('n', z.string().refine(name => validation.isValidUserPrincipalName(name), name => ({
-        message: `'${name}' is not a valid UPN.`
-    })).optional()),
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    userId: z.string().refine(id => validation.isValidGuid(id), {
+        error: e => `'${e.input}' is not a valid GUID.`
+    }).optional().alias('i'),
+    userName: z.string().refine(name => validation.isValidUserPrincipalName(name), {
+        error: e => `'${e.input}' is not a valid UPN.`
+    }).optional().alias('n'),
     dateFormat: z.string().optional(),
     timeFormat: z.string().optional(),
     timeZone: z.string().optional(),
@@ -32,8 +31,7 @@ const options = globalOptionsZod
     autoReplyEndDateTime: z.string().optional(),
     autoReplyEndTimeZone: z.string().optional(),
     autoReplyStatus: z.enum(['disabled', 'scheduled', 'alwaysEnabled']).optional()
-})
-    .strict();
+});
 class OutlookMailboxSettingsSetCommand extends GraphCommand {
     get name() {
         return commands.MAILBOX_SETTINGS_SET;
@@ -47,13 +45,15 @@ class OutlookMailboxSettingsSetCommand extends GraphCommand {
     getRefinedSchema(schema) {
         return schema
             .refine(options => !(options.userId && options.userName), {
-            message: 'Specify either userId or userName, but not both'
+            error: 'Specify either userId or userName, but not both'
         })
-            .refine(options => [options.workingDays, options.workingHoursStartTime, options.workingHoursEndTime, options.workingHoursTimeZone,
+            .refine(options => [
+            options.workingDays, options.workingHoursStartTime, options.workingHoursEndTime, options.workingHoursTimeZone,
             options.autoReplyStatus, options.autoReplyExternalAudience, options.autoReplyExternalMessage, options.autoReplyInternalMessage,
             options.autoReplyStartDateTime, options.autoReplyStartTimeZone, options.autoReplyEndDateTime, options.autoReplyEndTimeZone,
-            options.timeFormat, options.timeZone, options.dateFormat, options.delegateMeetingMessageDeliveryOptions, options.language].filter(o => o !== undefined).length > 0, {
-            message: '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'
+            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'
         });
     }
     async commandAction(logger, args) {

package/dist/m365/outlook/commands/roomlist/roomlist-list.js

@@ -1,8 +1,9 @@
+import { z } from 'zod';
 import { globalOptionsZod } from '../../../../Command.js';
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-const options = globalOptionsZod.strict();
+export const options = z.strictObject({ ...globalOptionsZod.shape });
 class OutlookRoomListListCommand extends GraphCommand {
     get name() {
         return commands.ROOMLIST_LIST;

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

@@ -2,15 +2,13 @@ import { z } from 'zod';
 import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
-import { zod } from '../../../../utils/zod.js';
 import PowerAppsCommand from '../../../base/PowerAppsCommand.js';
 import commands from '../../commands.js';
-const options = globalOptionsZod
-    .extend({
-    name: zod.alias('n', z.string().optional()),
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    name: z.string().optional().alias('n'),
     default: z.boolean().optional()
-})
-    .strict();
+});
 class PaEnvironmentGetCommand extends PowerAppsCommand {
     get name() {
         return commands.ENVIRONMENT_GET;
@@ -24,7 +22,7 @@ class PaEnvironmentGetCommand extends PowerAppsCommand {
     getRefinedSchema(schema) {
         return schema
             .refine(options => !!options.name !== !!options.default, {
-            message: `Specify either name or default, but not both.`
+            error: `Specify either name or default, but not both.`
         });
     }
     async commandAction(logger, args) {

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

@@ -2,7 +2,8 @@ import request from '../../../../request.js';
 import PowerAppsCommand from '../../../base/PowerAppsCommand.js';
 import commands from '../../commands.js';
 import { globalOptionsZod } from '../../../../Command.js';
-const options = globalOptionsZod.strict();
+import { z } from 'zod';
+export const options = z.strictObject({ ...globalOptionsZod.shape });
 class PaEnvironmentListCommand extends PowerAppsCommand {
     get name() {
         return commands.ENVIRONMENT_LIST;

package/dist/m365/planner/commands/tenant/tenant-settings-list.js

@@ -2,7 +2,7 @@ import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import PlannerCommand from '../../../base/PlannerCommand.js';
 import commands from '../../commands.js';
-const options = globalOptionsZod.strict();
+export const options = globalOptionsZod.strict();
 class PlannerTenantSettingsListCommand extends PlannerCommand {
     get name() {
         return commands.TENANT_SETTINGS_LIST;

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

@@ -2,16 +2,14 @@ import { z } from 'zod';
 import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
-import { zod } from '../../../../utils/zod.js';
 import PowerPlatformCommand from '../../../base/PowerPlatformCommand.js';
 import commands from '../../commands.js';
-const options = globalOptionsZod
-    .extend({
-    name: zod.alias('n', z.string().optional()),
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    name: z.string().optional().alias('n'),
     default: z.boolean().optional(),
     asAdmin: z.boolean().optional()
-})
-    .strict();
+});
 class PpEnvironmentGetCommand extends PowerPlatformCommand {
     get name() {
         return commands.ENVIRONMENT_GET;
@@ -25,7 +23,7 @@ class PpEnvironmentGetCommand extends PowerPlatformCommand {
     getRefinedSchema(schema) {
         return schema
             .refine(options => !!options.name !== !!options.default, {
-            message: `Specify either name or default, but not both.`
+            error: `Specify either name or default, but not both.`
         });
     }
     async commandAction(logger, args) {

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

@@ -3,11 +3,10 @@ import PowerPlatformCommand from '../../../base/PowerPlatformCommand.js';
 import commands from '../../commands.js';
 import { z } from 'zod';
 import { globalOptionsZod } from '../../../../Command.js';
-const options = globalOptionsZod
-    .extend({
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
     asAdmin: z.boolean().optional()
-})
-    .strict();
+});
 class PpEnvironmentListCommand extends PowerPlatformCommand {
     get name() {
         return commands.ENVIRONMENT_LIST;

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

@@ -2,7 +2,7 @@ import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import PowerBICommand from '../../../base/PowerBICommand.js';
 import commands from '../../commands.js';
-const options = globalOptionsZod.strict();
+export const options = globalOptionsZod.strict();
 class PpGatewayListCommand extends PowerBICommand {
     get name() {
         return commands.GATEWAY_LIST;

package/dist/m365/pp/commands/tenant/tenant-settings-list.js

@@ -2,7 +2,7 @@ import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import PowerPlatformCommand from '../../../base/PowerPlatformCommand.js';
 import commands from '../../commands.js';
-const options = globalOptionsZod.strict();
+export const options = globalOptionsZod.strict();
 class PpTenantSettingsListCommand extends PowerPlatformCommand {
     get name() {
         return commands.TENANT_SETTINGS_LIST;

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

@@ -1,20 +1,20 @@
 import { globalOptionsZod } from '../../../../Command.js';
 import { powerPlatform } from '../../../../utils/powerPlatform.js';
 import { validation } from '../../../../utils/validation.js';
-import { zod } from '../../../../utils/zod.js';
 import PowerPlatformCommand from '../../../base/PowerPlatformCommand.js';
 import commands from '../../commands.js';
 import { z } from 'zod';
-const options = globalOptionsZod
-    .extend({
-    url: zod.alias('u', z.string().optional()
-        .refine(url => url === undefined || validation.isValidPowerPagesUrl(url) === true, url => ({
-        message: `'${url}' is not a valid Power Pages URL.`
-    }))),
-    id: zod.alias('i', z.string().uuid().optional()),
-    name: zod.alias('n', z.string().optional()),
-    environmentName: zod.alias('e', z.string())
-}).strict();
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    url: z.string().optional()
+        .refine(url => url === undefined || validation.isValidPowerPagesUrl(url) === true, {
+        error: e => `'${e.input}' is not a valid Power Pages URL.`
+    })
+        .alias('u'),
+    id: z.uuid().optional().alias('i'),
+    name: z.string().optional().alias('n'),
+    environmentName: z.string().alias('e')
+});
 class PpWebSiteGetCommand extends PowerPlatformCommand {
     get name() {
         return commands.WEBSITE_GET;
@@ -28,7 +28,7 @@ class PpWebSiteGetCommand extends PowerPlatformCommand {
     getRefinedSchema(schema) {
         return schema
             .refine(options => [options.url, options.id, options.name].filter(x => x !== undefined).length === 1, {
-            message: `Specify either url, id or name, but not multiple.`
+            error: `Specify either url, id or name, but not multiple.`
         });
     }
     async commandAction(logger, args) {

package/dist/m365/purview/commands/retentionevent/retentionevent-list.js

@@ -1,8 +1,9 @@
+import { z } from 'zod';
 import { globalOptionsZod } from '../../../../Command.js';
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-const options = globalOptionsZod.strict();
+export const options = z.strictObject({ ...globalOptionsZod.shape });
 class PurviewRetentionEventListCommand extends GraphCommand {
     get name() {
         return commands.RETENTIONEVENT_LIST;

package/dist/m365/purview/commands/retentioneventtype/retentioneventtype-list.js

@@ -2,7 +2,7 @@ import { globalOptionsZod } from '../../../../Command.js';
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-const options = globalOptionsZod.strict();
+export const options = globalOptionsZod.strict();
 class PurviewRetentionEventTypeListCommand extends GraphCommand {
     get name() {
         return commands.RETENTIONEVENTTYPE_LIST;

package/dist/m365/purview/commands/retentionlabel/retentionlabel-list.js

@@ -2,7 +2,7 @@ import { globalOptionsZod } from '../../../../Command.js';
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-const options = globalOptionsZod.strict();
+export const options = globalOptionsZod.strict();
 class PurviewRetentionLabelListCommand extends GraphCommand {
     get name() {
         return commands.RETENTIONLABEL_LIST;

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

@@ -1,28 +1,23 @@
 import { globalOptionsZod } from '../../../../Command.js';
 import { z } from 'zod';
-import { zod } from '../../../../utils/zod.js';
 import commands from '../../commands.js';
 import { validation } from '../../../../utils/validation.js';
 import { spe } from '../../../../utils/spe.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import request from '../../../../request.js';
-const options = globalOptionsZod
-    .extend({
-    name: zod.alias('n', z.string()),
-    description: zod.alias('d', z.string().optional()),
-    containerTypeId: z.string()
-        .refine(id => validation.isValidGuid(id), id => ({
-        message: `'${id}' is not a valid GUID.`
-    })).optional(),
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    name: z.string().alias('n'),
+    description: z.string().optional().alias('d'),
+    containerTypeId: z.uuid().optional(),
     containerTypeName: z.string().optional(),
     ocrEnabled: z.boolean().optional(),
     itemMajorVersionLimit: z.number()
-        .refine(numb => validation.isValidPositiveInteger(numb), numb => ({
-        message: `'${numb}' is not a valid positive integer.`
-    })).optional(),
+        .refine(numb => validation.isValidPositiveInteger(numb), {
+        error: e => `'${e.input}' is not a valid positive integer.`
+    }).optional(),
     itemVersioningEnabled: z.boolean().optional()
-})
-    .strict();
+});
 class SpeContainerAddCommand extends GraphCommand {
     get name() {
         return commands.CONTAINER_ADD;
@@ -36,7 +31,7 @@ class SpeContainerAddCommand extends GraphCommand {
     getRefinedSchema(schema) {
         return schema
             .refine((options) => [options.containerTypeId, options.containerTypeName].filter(o => o !== undefined).length === 1, {
-            message: 'Use one of the following options: containerTypeId or containerTypeName.'
+            error: 'Use one of the following options: containerTypeId or containerTypeName.'
         });
     }
     async commandAction(logger, args) {

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

@@ -1,16 +1,14 @@
 import { cli } from '../../../../cli/cli.js';
 import { z } from 'zod';
-import { zod } from '../../../../utils/zod.js';
 import { 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';
-const options = globalOptionsZod
-    .extend({
-    containerId: zod.alias('i', z.string())
-})
-    .strict();
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    containerId: z.string().alias('i')
+});
 class SpeContainerPermissionListCommand extends GraphCommand {
     get name() {
         return commands.CONTAINER_PERMISSION_LIST;

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

@@ -1,19 +1,14 @@
 import { globalOptionsZod } from '../../../../Command.js';
 import { z } from 'zod';
 import commands from '../../commands.js';
-import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import { spe } from '../../../../utils/spe.js';
 import { odata } from '../../../../utils/odata.js';
-const options = globalOptionsZod
-    .extend({
-    containerTypeId: z.string()
-        .refine(id => validation.isValidGuid(id), id => ({
-        message: `'${id}' is not a valid GUID.`
-    })).optional(),
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    containerTypeId: z.uuid().optional(),
     containerTypeName: z.string().optional()
-})
-    .strict();
+});
 class SpeContainerRecycleBinItemListCommand extends GraphCommand {
     get name() {
         return commands.CONTAINER_RECYCLEBINITEM_LIST;
@@ -30,7 +25,7 @@ class SpeContainerRecycleBinItemListCommand extends GraphCommand {
     getRefinedSchema(schema) {
         return schema
             .refine((options) => [options.containerTypeId, options.containerTypeName].filter(o => o !== undefined).length === 1, {
-            message: 'Use one of the following options: containerTypeId or containerTypeName.'
+            error: 'Use one of the following options: containerTypeId or containerTypeName.'
         });
     }
     async commandAction(logger, args) {

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

@@ -0,0 +1,96 @@
+import { globalOptionsZod } from '../../../../Command.js';
+import { z } from 'zod';
+import commands from '../../commands.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import { spe } from '../../../../utils/spe.js';
+import { odata } from '../../../../utils/odata.js';
+import { formatting } from '../../../../utils/formatting.js';
+import { cli } from '../../../../cli/cli.js';
+import request from '../../../../request.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    id: z.string().optional().alias('i'),
+    name: z.string().optional().alias('n'),
+    containerTypeId: z.uuid().optional(),
+    containerTypeName: z.string().optional(),
+    force: z.boolean().optional().alias('f')
+});
+class SpeContainerRecycleBinItemRemoveCommand extends GraphCommand {
+    get name() {
+        return commands.CONTAINER_RECYCLEBINITEM_REMOVE;
+    }
+    get description() {
+        return 'Permanently removes a container from the recycle bin';
+    }
+    get schema() {
+        return options;
+    }
+    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.'
+        })
+            .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 removing a container by name.'
+        });
+    }
+    async commandAction(logger, args) {
+        if (!args.options.force) {
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to permanently remove deleted container '${args.options.id || args.options.name}'?` });
+            if (!result) {
+                return;
+            }
+        }
+        try {
+            const containerId = await this.getContainerId(args.options, logger);
+            if (this.verbose) {
+                await logger.logToStderr(`Permanently removing deleted container with ID '${containerId}'...`);
+            }
+            const requestOptions = {
+                url: `${this.resource}/v1.0/storage/fileStorage/deletedContainers/${containerId}`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            await request.delete(requestOptions);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+    async getContainerId(options, logger) {
+        if (options.id) {
+            return options.id;
+        }
+        if (this.verbose) {
+            await logger.logToStderr(`Retrieving container with name '${options.name}'...`);
+        }
+        const containerTypeId = await this.getContainerTypeId(options, logger);
+        const containers = await odata.getAllItems(`${this.resource}/v1.0/storage/fileStorage/deletedContainers?$filter=containerTypeId eq ${containerTypeId}&$select=id,displayName`);
+        const matchingContainers = containers.filter(c => c.displayName.toLowerCase() === options.name.toLowerCase());
+        if (matchingContainers.length === 0) {
+            throw new Error(`The specified container '${options.name}' does not exist.`);
+        }
+        if (matchingContainers.length > 1) {
+            const containerKeyValuePair = formatting.convertArrayToHashTable('id', matchingContainers);
+            const container = await cli.handleMultipleResultsFound(`Multiple containers with name '${options.name}' found.`, containerKeyValuePair);
+            return container.id;
+        }
+        return matchingContainers[0].id;
+    }
+    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 SpeContainerRecycleBinItemRemoveCommand();
+//# sourceMappingURL=container-recyclebinitem-remove.js.map

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

@@ -1,24 +1,19 @@
 import { globalOptionsZod } from '../../../../Command.js';
 import { z } from 'zod';
 import commands from '../../commands.js';
-import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import { spe } from '../../../../utils/spe.js';
 import { odata } from '../../../../utils/odata.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
-const options = globalOptionsZod
-    .extend({
-    containerTypeId: z.string()
-        .refine(id => validation.isValidGuid(id), id => ({
-        message: `'${id}' is not a valid GUID.`
-    })).optional(),
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    containerTypeId: z.uuid().optional(),
     containerTypeName: z.string().optional(),
     id: z.string().optional(),
     name: z.string().optional()
-})
-    .strict();
+});
 class SpeContainerRecycleBinItemRestoreCommand extends GraphCommand {
     get name() {
         return commands.CONTAINER_RECYCLEBINITEM_RESTORE;
@@ -32,13 +27,13 @@ class SpeContainerRecycleBinItemRestoreCommand extends GraphCommand {
     getRefinedSchema(schema) {
         return schema
             .refine((options) => [options.id, options.name].filter(o => o !== undefined).length === 1, {
-            message: 'Use one of the following options: id or name.'
+            error: 'Use one of the following options: id or name.'
         })
             .refine((options) => !options.name || [options.containerTypeId, options.containerTypeName].filter(o => o !== undefined).length === 1, {
-            message: '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.'
         })
             .refine((options) => options.name || [options.containerTypeId, options.containerTypeName].filter(o => o !== undefined).length === 0, {
-            message: 'Options containerTypeId and containerTypeName are only required when restoring a container by name.'
+            error: 'Options containerTypeId and containerTypeName are only required when restoring a container by name.'
         });
     }
     async commandAction(logger, args) {

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

@@ -1,25 +1,19 @@
 import { globalOptionsZod } from '../../../../Command.js';
 import { z } from 'zod';
-import { zod } from '../../../../utils/zod.js';
 import commands from '../../commands.js';
-import { validation } from '../../../../utils/validation.js';
 import { spe } from '../../../../utils/spe.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import request from '../../../../request.js';
 import { cli } from '../../../../cli/cli.js';
-const options = globalOptionsZod
-    .extend({
-    id: zod.alias('i', z.string().optional()),
-    name: zod.alias('n', z.string().optional()),
-    containerTypeId: z.string()
-        .refine(id => validation.isValidGuid(id), id => ({
-        message: `'${id}' is not a valid GUID.`
-    })).optional(),
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    id: z.string().optional().alias('i'),
+    name: z.string().optional().alias('n'),
+    containerTypeId: z.uuid().optional(),
     containerTypeName: z.string().optional(),
     recycle: z.boolean().optional(),
-    force: zod.alias('f', z.boolean().optional())
-})
-    .strict();
+    force: z.boolean().optional().alias('f')
+});
 class SpeContainerRemoveCommand extends GraphCommand {
     get name() {
         return commands.CONTAINER_REMOVE;
@@ -33,13 +27,13 @@ class SpeContainerRemoveCommand extends GraphCommand {
     getRefinedSchema(schema) {
         return schema
             .refine((options) => [options.id, options.name].filter(o => o !== undefined).length === 1, {
-            message: 'Use one of the following options: id or name.'
+            error: 'Use one of the following options: id or name.'
         })
             .refine((options) => !options.name || [options.containerTypeId, options.containerTypeName].filter(o => o !== undefined).length === 1, {
-            message: '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.'
         })
             .refine((options) => options.name || [options.containerTypeId, options.containerTypeName].filter(o => o !== undefined).length === 0, {
-            message: 'Options containerTypeId and containerTypeName are only required when deleting a container by name.'
+            error: 'Options containerTypeId and containerTypeName are only required when deleting a container by name.'
         });
     }
     async commandAction(logger, args) {

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

@@ -1,40 +1,35 @@
 import { globalOptionsZod } from '../../../../Command.js';
 import { z } from 'zod';
-import { zod } from '../../../../utils/zod.js';
 import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphDelegatedCommand from '../../../base/GraphDelegatedCommand.js';
 import commands from '../../commands.js';
 import Auth from '../../../../Auth.js';
 const consumingTenantOverridablesOptions = ['urlTemplate', 'isDiscoverabilityEnabled', 'isSearchEnabled', 'isItemVersioningEnabled', 'itemMajorVersionLimit', 'maxStoragePerContainerInBytes'];
-const options = globalOptionsZod
-    .extend({
-    name: zod.alias('n', z.string()),
-    appId: z.string()
-        .refine(id => validation.isValidGuid(id), id => ({
-        message: `'${id}' is not a valid GUID.`
-    })).optional(),
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    name: z.string().alias('n'),
+    appId: z.uuid().optional(),
     billingType: z.enum(['standard', 'trial', 'directToCustomer']).default('standard'),
     consumingTenantOverridables: z.string()
-        .refine(values => values.split(',').every(v => consumingTenantOverridablesOptions.includes(v.trim())), values => ({
-        message: `'${values}' is not a valid value. Valid options are: ${consumingTenantOverridablesOptions.join(', ')}.`
-    })).optional(),
+        .refine(values => values.split(',').every(v => consumingTenantOverridablesOptions.includes(v.trim())), {
+        error: e => `'${e.input}' is not a valid value. Valid options are: ${consumingTenantOverridablesOptions.join(', ')}.`
+    }).optional(),
     isDiscoverabilityEnabled: z.boolean().optional(),
     isItemVersioningEnabled: z.boolean().optional(),
     isSearchEnabled: z.boolean().optional(),
     isSharingRestricted: z.boolean().optional(),
     itemMajorVersionLimit: z.number()
-        .refine(n => validation.isValidPositiveInteger(n), n => ({
-        message: `'${n}' is not a valid positive integer.`
-    })).optional(),
+        .refine(n => validation.isValidPositiveInteger(n), {
+        error: e => `'${e.input}' is not a valid positive integer.`
+    }).optional(),
     maxStoragePerContainerInBytes: z.number()
-        .refine(n => validation.isValidPositiveInteger(n), n => ({
-        message: `'${n}' is not a valid positive integer.`
-    })).optional(),
+        .refine(n => validation.isValidPositiveInteger(n), {
+        error: e => `'${e.input}' is not a valid positive integer.`
+    }).optional(),
     sharingCapability: z.enum(['disabled', 'externalUserSharingOnly', 'externalUserAndGuestSharing', 'existingExternalUserSharingOnly']).optional(),
     urlTemplate: z.string().optional()
-})
-    .strict();
+});
 class SpeContainerTypeAddCommand extends GraphDelegatedCommand {
     get name() {
         return commands.CONTAINERTYPE_ADD;
@@ -48,7 +43,7 @@ class SpeContainerTypeAddCommand extends GraphDelegatedCommand {
     getRefinedSchema(schema) {
         return schema
             .refine(options => !options.itemMajorVersionLimit || options.isItemVersioningEnabled !== false, {
-            message: `Cannot set itemMajorVersionLimit when isItemVersioningEnabled is false.`
+            error: `Cannot set itemMajorVersionLimit when isItemVersioningEnabled is false.`
         });
     }
     async commandAction(logger, args) {