@pnp/cli-microsoft365 11.9.0-beta.93bd508 → 11.9.0-beta.9bd71dd

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

@@ -1,13 +1,24 @@
-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 _GraphSubscriptionAddCommand_instances, _GraphSubscriptionAddCommand_initTelemetry, _GraphSubscriptionAddCommand_initOptions, _GraphSubscriptionAddCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+const allowedTlsVersions = ['v1_0', 'v1_1', 'v1_2', 'v1_3'];
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    resource: z.string().alias('r'),
+    notificationUrl: z.string().alias('u'),
+    changeTypes: z.string().alias('c'),
+    expirationDateTime: z.string().optional().alias('e'),
+    clientState: z.string().optional().alias('s'),
+    lifecycleNotificationUrl: z.string().optional(),
+    notificationUrlAppId: z.string().optional(),
+    latestTLSVersion: z.enum(allowedTlsVersions).optional(),
+    withResourceData: z.boolean().optional(),
+    encryptionCertificate: z.string().optional(),
+    encryptionCertificateId: z.string().optional()
+});
 const DEFAULT_EXPIRATION_DELAY_IN_MINUTES_PER_RESOURCE_TYPE = {
     // User, group, other directory resources	4230 minutes (under 3 days)
     "users": 4230,
@@ -34,13 +45,52 @@ class GraphSubscriptionAddCommand extends GraphCommand {
     get description() {
         return 'Creates a Microsoft Graph subscription';
     }
-    constructor() {
-        super();
-        _GraphSubscriptionAddCommand_instances.add(this);
-        this.allowedTlsVersions = ['v1_0', 'v1_1', 'v1_2', 'v1_3'];
-        __classPrivateFieldGet(this, _GraphSubscriptionAddCommand_instances, "m", _GraphSubscriptionAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _GraphSubscriptionAddCommand_instances, "m", _GraphSubscriptionAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _GraphSubscriptionAddCommand_instances, "m", _GraphSubscriptionAddCommand_initValidators).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => {
+            const url = options.notificationUrl.toLowerCase();
+            return url.startsWith('https://') || url.startsWith('eventhub:https://') || url.startsWith('eventgrid:?azuresubscriptionid=');
+        }, {
+            error: e => `The specified notification URL '${e.input.notificationUrl}' does not start with either 'https://' or 'EventHub:https://' or 'EventGrid:?azuresubscriptionid='`,
+            path: ['notificationUrl']
+        })
+            .refine(options => this.isValidChangeTypes(options.changeTypes), {
+            error: `The specified changeTypes are invalid. Valid options are 'created', 'updated' and 'deleted'`,
+            path: ['changeTypes']
+        })
+            .refine(options => !options.expirationDateTime || validation.isValidISODateTime(options.expirationDateTime), {
+            error: 'The expirationDateTime is not a valid ISO date string',
+            path: ['expirationDateTime']
+        })
+            .refine(options => !options.clientState || options.clientState.length <= 128, {
+            error: 'The clientState value exceeds the maximum length of 128 characters',
+            path: ['clientState']
+        })
+            .refine(options => {
+            if (!options.lifecycleNotificationUrl) {
+                return true;
+            }
+            const url = options.lifecycleNotificationUrl.toLowerCase();
+            return url.startsWith('https://') || url.startsWith('eventhub:https://') || url.startsWith('eventgrid:?azuresubscriptionid=');
+        }, {
+            error: e => `The lifecycle notification URL '${e.input.lifecycleNotificationUrl}' does not start with either 'https://' or 'EventHub:https://' or 'EventGrid:?azuresubscriptionid='`,
+            path: ['lifecycleNotificationUrl']
+        })
+            .refine(options => !options.withResourceData || options.encryptionCertificate, {
+            error: `The 'encryptionCertificate' options is required to include the changed resource data`,
+            path: ['encryptionCertificate']
+        })
+            .refine(options => !options.withResourceData || options.encryptionCertificateId, {
+            error: `The 'encryptionCertificateId' options is required to include the changed resource data`,
+            path: ['encryptionCertificateId']
+        })
+            .refine(options => !options.notificationUrlAppId || validation.isValidGuid(options.notificationUrlAppId), {
+            error: e => `${e.input.notificationUrlAppId} is not a valid GUID for the 'notificationUrlAppId'`,
+            path: ['notificationUrlAppId']
+        });
     }
     async commandAction(logger, args) {
         const data = {
@@ -123,81 +173,5 @@ class GraphSubscriptionAddCommand extends GraphCommand {
         return invalidChangesTypes.length === 0;
     }
 }
-_GraphSubscriptionAddCommand_instances = new WeakSet(), _GraphSubscriptionAddCommand_initTelemetry = function _GraphSubscriptionAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            changeTypes: args.options.changeTypes,
-            expirationDateTime: typeof args.options.expirationDateTime !== 'undefined',
-            clientState: typeof args.options.clientState !== 'undefined',
-            lifecycleNotificationUrl: typeof args.options.lifecycleNotificationUrl !== 'undefined',
-            notificationUrlAppId: typeof args.options.notificationUrlAppId !== 'undefined',
-            latestTLSVersion: typeof args.options.latestTLSVersion !== 'undefined',
-            withResourceData: !!args.options.withResourceData,
-            encryptionCertificate: typeof args.options.encryptionCertificate !== 'undefined',
-            encryptionCertificateId: typeof args.options.encryptionCertificateId !== 'undefined'
-        });
-    });
-}, _GraphSubscriptionAddCommand_initOptions = function _GraphSubscriptionAddCommand_initOptions() {
-    this.options.unshift({
-        option: '-r, --resource <resource>'
-    }, {
-        option: '-u, --notificationUrl <notificationUrl>'
-    }, {
-        option: '-c, --changeTypes <changeTypes>',
-        autocomplete: ['created', 'updated', 'deleted']
-    }, {
-        option: '-e, --expirationDateTime [expirationDateTime]'
-    }, {
-        option: '-s, --clientState [clientState]'
-    }, {
-        option: '--lifecycleNotificationUrl [lifecycleNotificationUrl]'
-    }, {
-        option: '--notificationUrlAppId [notificationUrlAppId]'
-    }, {
-        option: '--latestTLSVersion [latestTLSVersion]',
-        autocomplete: this.allowedTlsVersions
-    }, {
-        option: '--withResourceData [withResourceData]'
-    }, {
-        option: '--encryptionCertificate [encryptionCertificate]'
-    }, {
-        option: '--encryptionCertificateId [encryptionCertificateId]'
-    });
-}, _GraphSubscriptionAddCommand_initValidators = function _GraphSubscriptionAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (!args.options.notificationUrl.toLowerCase().startsWith('https://')
-            && !args.options.notificationUrl.toLowerCase().startsWith('eventhub:https://')
-            && !args.options.notificationUrl.toLowerCase().startsWith('eventgrid:?azuresubscriptionid=')) {
-            return `The specified notification URL '${args.options.notificationUrl}' does not start with either 'https://' or 'EventHub:https://' or 'EventGrid:?azuresubscriptionid='`;
-        }
-        if (!this.isValidChangeTypes(args.options.changeTypes)) {
-            return `The specified changeTypes are invalid. Valid options are 'created', 'updated' and 'deleted'`;
-        }
-        if (args.options.expirationDateTime && !validation.isValidISODateTime(args.options.expirationDateTime)) {
-            return 'The expirationDateTime is not a valid ISO date string';
-        }
-        if (args.options.clientState && args.options.clientState.length > 128) {
-            return 'The clientState value exceeds the maximum length of 128 characters';
-        }
-        if (args.options.lifecycleNotificationUrl && !args.options.lifecycleNotificationUrl.toLowerCase().startsWith('https://')
-            && !args.options.lifecycleNotificationUrl.toLowerCase().startsWith('eventhub:https://')
-            && !args.options.lifecycleNotificationUrl.toLowerCase().startsWith('eventgrid:?azuresubscriptionid=')) {
-            return `The lifecycle notification URL '${args.options.lifecycleNotificationUrl}' does not start with either 'https://' or 'EventHub:https://' or 'EventGrid:?azuresubscriptionid='`;
-        }
-        if (args.options.latestTLSVersion && this.allowedTlsVersions.map(x => x.toLowerCase()).indexOf(args.options.latestTLSVersion.toLowerCase()) === -1) {
-            return `${args.options.latestTLSVersion} is not a valid TLS version. Allowed values are ${this.allowedTlsVersions.join(', ')}`;
-        }
-        if (args.options.withResourceData && !args.options.encryptionCertificate) {
-            return `The 'encryptionCertificate' options is required to include the changed resource data`;
-        }
-        if (args.options.withResourceData && !args.options.encryptionCertificateId) {
-            return `The 'encryptionCertificateId' options is required to include the changed resource data`;
-        }
-        if (args.options.notificationUrlAppId && !validation.isValidGuid(args.options.notificationUrlAppId)) {
-            return `${args.options.notificationUrlAppId} is not a valid GUID for the 'notificationUrlAppId'`;
-        }
-        return true;
-    });
-};
 export default new GraphSubscriptionAddCommand();
 //# sourceMappingURL=subscription-add.js.map

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

@@ -0,0 +1,64 @@
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
+import { validation } from '../../../../utils/validation.js';
+import { calendarGroup } from '../../../../utils/calendarGroup.js';
+import { odata } from '../../../../utils/odata.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    userId: z.string()
+        .refine(userId => validation.isValidGuid(userId), {
+        error: e => `'${e.input}' is not a valid GUID.`
+    }).optional(),
+    userName: z.string()
+        .refine(userName => validation.isValidUserPrincipalName(userName), {
+        error: e => `'${e.input}' is not a valid UPN.`
+    }).optional(),
+    calendarGroupId: z.string().optional(),
+    calendarGroupName: z.string().optional()
+});
+class OutlookCalendarListCommand extends GraphCommand {
+    get name() {
+        return commands.CALENDAR_LIST;
+    }
+    get description() {
+        return 'Retrieves a list of all calendars of a user or a group';
+    }
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .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), {
+            error: 'Specify either calendarGroupId or calendarGroupName, but not both'
+        });
+    }
+    defaultProperties() {
+        return ['id', 'name'];
+    }
+    async commandAction(logger, args) {
+        if (this.verbose) {
+            await logger.logToStderr(`Retrieving calendars for ${args.options.userId ?? args.options.userName}...`);
+        }
+        try {
+            const userIdentifier = args.options.userId ?? args.options.userName;
+            let calendarGroupId = args.options.calendarGroupId;
+            if (args.options.calendarGroupName) {
+                const group = await calendarGroup.getUserCalendarGroupByName(userIdentifier, args.options.calendarGroupName, 'id');
+                calendarGroupId = group.id;
+            }
+            const url = `${this.resource}/v1.0/users('${userIdentifier}')/${calendarGroupId ? `calendarGroups/${calendarGroupId}/` : ''}calendars`;
+            const calendars = await odata.getAllItems(url);
+            await logger.log(calendars);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+}
+export default new OutlookCalendarListCommand();
+//# sourceMappingURL=calendar-list.js.map

package/dist/m365/outlook/commands/mail/mail-send.js

@@ -1,17 +1,27 @@
-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 _OutlookMailSendCommand_instances, _OutlookMailSendCommand_initTelemetry, _OutlookMailSendCommand_initOptions, _OutlookMailSendCommand_initTypes, _OutlookMailSendCommand_initValidators;
 import fs from 'fs';
 import path from 'path';
 import auth from '../../../../Auth.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { accessToken } from '../../../../utils/accessToken.js';
 import { formatting } from '../../../../utils/formatting.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+import { z } from 'zod';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    subject: z.string().alias('s'),
+    to: z.string().alias('t'),
+    cc: z.string().optional(),
+    bcc: z.string().optional(),
+    sender: z.string().optional(),
+    mailbox: z.string().optional().alias('m'),
+    bodyContents: z.string(),
+    bodyContentType: z.enum(['Text', 'HTML']).optional(),
+    importance: z.enum(['low', 'normal', 'high']).optional(),
+    attachment: z.union([z.string(), z.string().array()]).optional(),
+    saveToSentItems: z.boolean().optional()
+});
 class OutlookMailSendCommand extends GraphCommand {
     get name() {
         return commands.MAIL_SEND;
@@ -19,13 +29,45 @@ class OutlookMailSendCommand extends GraphCommand {
     get description() {
         return 'Sends an email';
     }
-    constructor() {
-        super();
-        _OutlookMailSendCommand_instances.add(this);
-        __classPrivateFieldGet(this, _OutlookMailSendCommand_instances, "m", _OutlookMailSendCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _OutlookMailSendCommand_instances, "m", _OutlookMailSendCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _OutlookMailSendCommand_instances, "m", _OutlookMailSendCommand_initTypes).call(this);
-        __classPrivateFieldGet(this, _OutlookMailSendCommand_instances, "m", _OutlookMailSendCommand_initValidators).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => {
+            if (!options.attachment) {
+                return true;
+            }
+            const attachments = typeof options.attachment === 'string' ? [options.attachment] : options.attachment;
+            for (const attachment of attachments) {
+                if (!fs.existsSync(attachment)) {
+                    return false;
+                }
+                if (!fs.lstatSync(attachment).isFile()) {
+                    return false;
+                }
+            }
+            const requestBody = this.getRequestBody(options);
+            // The max body size of the request is 4 194 304 chars before getting a 413 response
+            if (JSON.stringify(requestBody).length > 4194304) {
+                return false;
+            }
+            return true;
+        }, {
+            error: (ctx) => {
+                const opts = ctx.input;
+                const attachments = typeof opts.attachment === 'string' ? [opts.attachment] : opts.attachment;
+                for (const attachment of attachments) {
+                    if (!fs.existsSync(attachment)) {
+                        return `File with path '${attachment}' was not found.`;
+                    }
+                    if (!fs.lstatSync(attachment).isFile()) {
+                        return `'${attachment}' is not a file.`;
+                    }
+                }
+                return 'Exceeded the max total size of attachments which is 3MB.';
+            }
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -83,76 +125,5 @@ class OutlookMailSendCommand extends GraphCommand {
         });
     }
 }
-_OutlookMailSendCommand_instances = new WeakSet(), _OutlookMailSendCommand_initTelemetry = function _OutlookMailSendCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            cc: typeof args.options.cc !== 'undefined',
-            bcc: typeof args.options.bcc !== 'undefined',
-            bodyContentType: args.options.bodyContentType,
-            saveToSentItems: args.options.saveToSentItems,
-            importance: args.options.importance,
-            mailbox: typeof args.options.mailbox !== 'undefined',
-            sender: typeof args.options.sender !== 'undefined',
-            attachment: typeof args.options.attachment !== 'undefined'
-        });
-    });
-}, _OutlookMailSendCommand_initOptions = function _OutlookMailSendCommand_initOptions() {
-    this.options.unshift({
-        option: '-s, --subject <subject>'
-    }, {
-        option: '-t, --to <to>'
-    }, {
-        option: '--cc [cc]'
-    }, {
-        option: '--bcc [bcc]'
-    }, {
-        option: '--sender [sender]'
-    }, {
-        option: '-m, --mailbox [mailbox]'
-    }, {
-        option: '--bodyContents <bodyContents>'
-    }, {
-        option: '--bodyContentType [bodyContentType]',
-        autocomplete: ['Text', 'HTML']
-    }, {
-        option: '--importance [importance]',
-        autocomplete: ['low', 'normal', 'high']
-    }, {
-        option: '--attachment [attachment]'
-    }, {
-        option: '--saveToSentItems [saveToSentItems]',
-        autocomplete: ['true', 'false']
-    });
-}, _OutlookMailSendCommand_initTypes = function _OutlookMailSendCommand_initTypes() {
-    this.types.boolean.push('saveToSentItems');
-}, _OutlookMailSendCommand_initValidators = function _OutlookMailSendCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.bodyContentType &&
-            args.options.bodyContentType !== 'Text' &&
-            args.options.bodyContentType !== 'HTML') {
-            return `${args.options.bodyContentType} is not a valid value for the bodyContentType option. Allowed values are Text|HTML`;
-        }
-        if (args.options.importance && ['low', 'normal', 'high'].indexOf(args.options.importance) === -1) {
-            return `'${args.options.importance}' is not a valid value for the importance option. Allowed values are low|normal|high`;
-        }
-        if (args.options.attachment) {
-            const attachments = typeof args.options.attachment === 'string' ? [args.options.attachment] : args.options.attachment;
-            for (const attachment of attachments) {
-                if (!fs.existsSync(attachment)) {
-                    return `File with path '${attachment}' was not found.`;
-                }
-                if (!fs.lstatSync(attachment).isFile()) {
-                    return `'${attachment}' is not a file.`;
-                }
-            }
-            const requestBody = this.getRequestBody(args.options);
-            // The max body size of the request is 4 194 304 chars before getting a 413 response
-            if (JSON.stringify(requestBody).length > 4194304) {
-                return 'Exceeded the max total size of attachments which is 3MB.';
-            }
-        }
-        return true;
-    });
-};
 export default new OutlookMailSendCommand();
 //# sourceMappingURL=mail-send.js.map

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

@@ -1,14 +1,23 @@
-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 _OutlookMessageGetCommand_instances, _OutlookMessageGetCommand_initTelemetry, _OutlookMessageGetCommand_initOptions;
 import auth from '../../../../Auth.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { accessToken } from '../../../../utils/accessToken.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+import { z } from 'zod';
+import { validation } from '../../../../utils/validation.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    id: z.string().alias('i'),
+    userId: z.string()
+        .refine(userId => validation.isValidGuid(userId), {
+        error: e => `'${e.input}' is not a valid GUID.`
+    }).optional(),
+    userName: z.string()
+        .refine(userName => validation.isValidUserPrincipalName(userName), {
+        error: e => `'${e.input}' is not a valid UPN.`
+    }).optional()
+});
 class OutlookMessageGetCommand extends GraphCommand {
     get name() {
         return commands.MESSAGE_GET;
@@ -16,11 +25,18 @@ class OutlookMessageGetCommand extends GraphCommand {
     get description() {
         return 'Retrieves specified message';
     }
-    constructor() {
-        super();
-        _OutlookMessageGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _OutlookMessageGetCommand_instances, "m", _OutlookMessageGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _OutlookMessageGetCommand_instances, "m", _OutlookMessageGetCommand_initOptions).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => !(options.userId && options.userName), {
+            error: 'Specify either userId or userName, but not both',
+            params: {
+                customCode: 'optionSet',
+                options: ['userId', 'userName']
+            }
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -65,21 +81,5 @@ class OutlookMessageGetCommand extends GraphCommand {
         }
     }
 }
-_OutlookMessageGetCommand_instances = new WeakSet(), _OutlookMessageGetCommand_initTelemetry = function _OutlookMessageGetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            userId: typeof args.options.userId !== 'undefined',
-            userName: typeof args.options.userName !== 'undefined'
-        });
-    });
-}, _OutlookMessageGetCommand_initOptions = function _OutlookMessageGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id <id>'
-    }, {
-        option: '--userId [userId]'
-    }, {
-        option: '--userName [userName]'
-    });
-};
 export default new OutlookMessageGetCommand();
 //# sourceMappingURL=message-get.js.map

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

@@ -1,9 +1,4 @@
-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 _OutlookMessageListCommand_instances, _OutlookMessageListCommand_initTelemetry, _OutlookMessageListCommand_initOptions, _OutlookMessageListCommand_initValidators, _OutlookMessageListCommand_initTypes, _OutlookMessageListCommand_initOptionSets;
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
@@ -14,6 +9,36 @@ import { cli } from '../../../../cli/cli.js';
 import { validation } from '../../../../utils/validation.js';
 import { accessToken } from '../../../../utils/accessToken.js';
 import auth from '../../../../Auth.js';
+import { z } from 'zod';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    folderId: z.string().optional(),
+    folderName: z.string().optional(),
+    startTime: z.string()
+        .refine(startTime => validation.isValidISODateTime(startTime), {
+        error: e => `'${e.input}' is not a valid ISO date string for option startTime.`
+    })
+        .refine(startTime => new Date(startTime) <= new Date(), {
+        error: 'startTime value cannot be in the future.'
+    })
+        .optional(),
+    endTime: z.string()
+        .refine(endTime => validation.isValidISODateTime(endTime), {
+        error: e => `'${e.input}' is not a valid ISO date string for option endTime.`
+    })
+        .refine(endTime => new Date(endTime) <= new Date(), {
+        error: 'endTime value cannot be in the future.'
+    })
+        .optional(),
+    userId: z.string()
+        .refine(userId => validation.isValidGuid(userId), {
+        error: e => `${e.input} is not a valid GUID for option userId.`
+    }).optional(),
+    userName: z.string()
+        .refine(userName => validation.isValidUserPrincipalName(userName), {
+        error: e => `${e.input} is not a valid UPN for option userName.`
+    }).optional()
+});
 class OutlookMessageListCommand extends GraphCommand {
     get name() {
         return commands.MESSAGE_LIST;
@@ -21,14 +46,28 @@ class OutlookMessageListCommand extends GraphCommand {
     get description() {
         return 'Gets all mail messages from the specified folder';
     }
-    constructor() {
-        super();
-        _OutlookMessageListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _OutlookMessageListCommand_instances, "m", _OutlookMessageListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _OutlookMessageListCommand_instances, "m", _OutlookMessageListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _OutlookMessageListCommand_instances, "m", _OutlookMessageListCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _OutlookMessageListCommand_instances, "m", _OutlookMessageListCommand_initTypes).call(this);
-        __classPrivateFieldGet(this, _OutlookMessageListCommand_instances, "m", _OutlookMessageListCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => !(options.folderId && options.folderName), {
+            error: 'Specify either folderId or folderName, but not both',
+            params: {
+                customCode: 'optionSet',
+                options: ['folderId', 'folderName']
+            }
+        })
+            .refine(options => !(options.userId && options.userName), {
+            error: 'Specify either userId or userName, but not both',
+            params: {
+                customCode: 'optionSet',
+                options: ['userId', 'userName']
+            }
+        })
+            .refine(options => !(options.startTime && options.endTime && new Date(options.startTime) >= new Date(options.endTime)), {
+            error: 'startTime must be before endTime.'
+        });
     }
     defaultProperties() {
         return ['subject', 'receivedDateTime'];
@@ -90,71 +129,5 @@ class OutlookMessageListCommand extends GraphCommand {
         return response.value[0].id;
     }
 }
-_OutlookMessageListCommand_instances = new WeakSet(), _OutlookMessageListCommand_initTelemetry = function _OutlookMessageListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            folderId: typeof args.options.folderId !== 'undefined',
-            folderName: typeof args.options.folderName !== 'undefined',
-            startTime: typeof args.options.startTime !== 'undefined',
-            endTime: typeof args.options.endTime !== 'undefined',
-            userId: typeof args.options.userId !== 'undefined',
-            userName: typeof args.options.userName !== 'undefined'
-        });
-    });
-}, _OutlookMessageListCommand_initOptions = function _OutlookMessageListCommand_initOptions() {
-    this.options.unshift({
-        option: '--folderName [folderName]',
-        autocomplete: Outlook.wellKnownFolderNames
-    }, {
-        option: '--folderId [folderId]'
-    }, {
-        option: '--startTime [startTime]'
-    }, {
-        option: '--endTime [endTime]'
-    }, {
-        option: '--userId [userId]'
-    }, {
-        option: '--userName [userName]'
-    });
-}, _OutlookMessageListCommand_initValidators = function _OutlookMessageListCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.startTime) {
-            if (!validation.isValidISODateTime(args.options.startTime)) {
-                return `'${args.options.startTime}' is not a valid ISO date string for option startTime.`;
-            }
-            if (new Date(args.options.startTime) > new Date()) {
-                return 'startTime value cannot be in the future.';
-            }
-        }
-        if (args.options.endTime) {
-            if (!validation.isValidISODateTime(args.options.endTime)) {
-                return `'${args.options.endTime}' is not a valid ISO date string for option endTime.`;
-            }
-            if (new Date(args.options.endTime) > new Date()) {
-                return 'endTime value cannot be in the future.';
-            }
-        }
-        if (args.options.startTime && args.options.endTime && new Date(args.options.startTime) >= new Date(args.options.endTime)) {
-            return 'startTime must be before endTime.';
-        }
-        if (args.options.userId && !validation.isValidGuid(args.options.userId)) {
-            return `${args.options.userId} is not a valid GUID for option userId.`;
-        }
-        if (args.options.userName && !validation.isValidUserPrincipalName(args.options.userName)) {
-            return `${args.options.userName} is not a valid UPN for option userName.`;
-        }
-        return true;
-    });
-}, _OutlookMessageListCommand_initTypes = function _OutlookMessageListCommand_initTypes() {
-    this.types.string.push('folderName', 'folderId', 'startTime', 'endTime', 'userId', 'userName');
-}, _OutlookMessageListCommand_initOptionSets = function _OutlookMessageListCommand_initOptionSets() {
-    this.optionSets.push({
-        options: ['folderId', 'folderName'],
-        runsWhen: (args) => args.options.folderId || args.options.folderName
-    }, {
-        options: ['userId', 'userName'],
-        runsWhen: (args) => args.options.userId || args.options.userName
-    });
-};
 export default new OutlookMessageListCommand();
 //# sourceMappingURL=message-list.js.map