@pnp/cli-microsoft365 11.9.0 → 11.10.0-beta.6474466

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

@@ -1,9 +1,5 @@
-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 _PlannerTaskSetCommand_instances, _PlannerTaskSetCommand_initTelemetry, _PlannerTaskSetCommand_initOptions, _PlannerTaskSetCommand_initValidators, _PlannerTaskSetCommand_initOptionSets, _PlannerTaskSetCommand_initTypes;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { entraGroup } from '../../../../utils/entraGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -12,6 +8,73 @@ import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 import { taskPriority } from '../../taskPriority.js';
+const allowedAppliedCategories = ['category1', 'category2', 'category3', 'category4', 'category5', 'category6'];
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    id: z.string().alias('i'),
+    title: z.string().optional().alias('t'),
+    planId: z.string().optional(),
+    planTitle: z.string().optional(),
+    rosterId: z.string().optional(),
+    ownerGroupId: z.string()
+        .refine(val => validation.isValidGuid(val), {
+        message: 'The value is not a valid GUID.'
+    })
+        .optional(),
+    ownerGroupName: z.string().optional(),
+    bucketId: z.string().optional(),
+    bucketName: z.string().optional(),
+    startDateTime: z.string()
+        .refine(val => validation.isValidISODateTime(val), {
+        message: 'The startDateTime is not a valid ISO date string.'
+    })
+        .optional(),
+    dueDateTime: z.string()
+        .refine(val => validation.isValidISODateTime(val), {
+        message: 'The dueDateTime is not a valid ISO date string.'
+    })
+        .optional(),
+    percentComplete: z.string()
+        .refine(val => !isNaN(Number(val)) && Number(val) >= 0 && Number(val) <= 100, {
+        message: 'percentComplete should be between 0 and 100.'
+    })
+        .optional(),
+    assignedToUserIds: z.string()
+        .superRefine((val, ctx) => {
+        const result = validation.isValidGuidArray(val);
+        if (result !== true) {
+            ctx.addIssue({ code: z.ZodIssueCode.custom, message: `The following GUIDs are invalid for the option 'assignedToUserIds': ${result}.` });
+        }
+    })
+        .optional(),
+    assignedToUserNames: z.string()
+        .superRefine((val, ctx) => {
+        const result = validation.isValidUserPrincipalNameArray(val);
+        if (result !== true) {
+            ctx.addIssue({ code: z.ZodIssueCode.custom, message: `The following user principal names are invalid for the option 'assignedToUserNames': ${result}.` });
+        }
+    })
+        .optional(),
+    assigneePriority: z.string().optional(),
+    description: z.string().optional(),
+    appliedCategories: z.string()
+        .refine(val => val.split(',').every(cat => allowedAppliedCategories.includes(cat.toLocaleLowerCase().trim())), {
+        message: `The appliedCategories contains invalid value. Specify either ${allowedAppliedCategories.join(', ')} as properties.`
+    })
+        .optional(),
+    orderHint: z.string().optional(),
+    priority: z.string()
+        .refine(val => {
+        const num = Number(val);
+        if (!isNaN(num)) {
+            return num >= 0 && num <= 10 && Number.isInteger(num);
+        }
+        return taskPriority.priorityValues.map(l => l.toLowerCase()).includes(val.toLowerCase());
+    }, {
+        message: `The value is not a valid priority. Allowed values are 0-10 or ${taskPriority.priorityValues.join('|')}.`
+    })
+        .optional()
+});
 class PlannerTaskSetCommand extends GraphCommand {
     get name() {
         return commands.TASK_SET;
@@ -19,15 +82,27 @@ class PlannerTaskSetCommand extends GraphCommand {
     get description() {
         return 'Updates a Microsoft Planner Task';
     }
-    constructor() {
-        super();
-        _PlannerTaskSetCommand_instances.add(this);
-        this.allowedAppliedCategories = ['category1', 'category2', 'category3', 'category4', 'category5', 'category6'];
-        __classPrivateFieldGet(this, _PlannerTaskSetCommand_instances, "m", _PlannerTaskSetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _PlannerTaskSetCommand_instances, "m", _PlannerTaskSetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _PlannerTaskSetCommand_instances, "m", _PlannerTaskSetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _PlannerTaskSetCommand_instances, "m", _PlannerTaskSetCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _PlannerTaskSetCommand_instances, "m", _PlannerTaskSetCommand_initTypes).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => !(opts.bucketId && opts.bucketName), {
+            message: `Specify either 'bucketId' or 'bucketName', but not both.`,
+            params: { customCode: 'optionSet', options: ['bucketId', 'bucketName'] }
+        })
+            .refine(opts => !opts.bucketName || [opts.planId, opts.planTitle, opts.rosterId].filter(x => x !== undefined).length === 1, {
+            message: `Specify exactly one of the following options: 'planId', 'planTitle' or 'rosterId'.`,
+            params: { customCode: 'optionSet', options: ['planId', 'planTitle', 'rosterId'] }
+        })
+            .refine(opts => !opts.planTitle || [opts.ownerGroupId, opts.ownerGroupName].filter(x => x !== undefined).length === 1, {
+            message: `Specify exactly one of the following options: 'ownerGroupId' or 'ownerGroupName'.`,
+            params: { customCode: 'optionSet', options: ['ownerGroupId', 'ownerGroupName'] }
+        })
+            .refine(opts => !(opts.assignedToUserIds && opts.assignedToUserNames), {
+            message: 'Specify either assignedToUserIds or assignedToUserNames but not both.',
+            params: { customCode: 'optionSet', options: ['assignedToUserIds', 'assignedToUserNames'] }
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -102,7 +177,7 @@ class PlannerTaskSetCommand extends GraphCommand {
             return {};
         }
         const categories = {};
-        options.appliedCategories.toLocaleLowerCase().split(',').forEach(x => categories[x] = true);
+        options.appliedCategories.toLocaleLowerCase().split(',').forEach(x => categories[x.trim()] = true);
         return categories;
     }
     async generateUserAssignments(options) {
@@ -121,7 +196,6 @@ class PlannerTaskSetCommand extends GraphCommand {
         if (options.assignedToUserIds) {
             return options.assignedToUserIds.split(',').map(o => o.trim());
         }
-        // Hitting this section means assignedToUserNames won't be undefined
         const userNames = options.assignedToUserNames;
         const userArr = userNames.split(',').map(o => o.trim());
         const promises = userArr.map(user => {
@@ -138,7 +212,6 @@ class PlannerTaskSetCommand extends GraphCommand {
         let userUpns = [];
         userUpns = usersRes.map(res => res.value[0]?.userPrincipalName);
         const userIds = usersRes.map(res => res.value[0]?.id);
-        // Find the members where no graph response was found
         const invalidUsers = userArr.filter(user => !userUpns.some((upn) => upn?.toLowerCase() === user.toLowerCase()));
         if (invalidUsers && invalidUsers.length > 0) {
             throw `Cannot proceed with planner task update. The following users provided are invalid : ${invalidUsers.join(',')}`;
@@ -188,7 +261,7 @@ class PlannerTaskSetCommand extends GraphCommand {
             requestBody.dueDateTime = options.dueDateTime;
         }
         if (options.percentComplete) {
-            requestBody.percentComplete = options.percentComplete;
+            requestBody.percentComplete = Number(options.percentComplete);
         }
         if (this.assignments && Object.keys(this.assignments).length > 0) {
             requestBody.assignments = this.assignments;
@@ -208,99 +281,5 @@ class PlannerTaskSetCommand extends GraphCommand {
         return requestBody;
     }
 }
-_PlannerTaskSetCommand_instances = new WeakSet(), _PlannerTaskSetCommand_initTelemetry = function _PlannerTaskSetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            title: typeof args.options.title !== 'undefined',
-            planId: typeof args.options.planId !== 'undefined',
-            planTitle: typeof args.options.planTitle !== 'undefined',
-            rosterId: typeof args.options.rosterId !== 'undefined',
-            ownerGroupId: typeof args.options.ownerGroupId !== 'undefined',
-            ownerGroupName: typeof args.options.ownerGroupName !== 'undefined',
-            bucketId: typeof args.options.bucketId !== 'undefined',
-            bucketName: typeof args.options.bucketName !== 'undefined',
-            startDateTime: typeof args.options.startDateTime !== 'undefined',
-            dueDateTime: typeof args.options.dueDateTime !== 'undefined',
-            percentComplete: typeof args.options.percentComplete !== 'undefined',
-            assignedToUserIds: typeof args.options.assignedToUserIds !== 'undefined',
-            assignedToUserNames: typeof args.options.assignedToUserNames !== 'undefined',
-            assigneePriority: typeof args.options.assigneePriority !== 'undefined',
-            description: typeof args.options.description !== 'undefined',
-            appliedCategories: typeof args.options.appliedCategories !== 'undefined',
-            orderHint: typeof args.options.orderHint !== 'undefined',
-            priority: typeof args.options.priority !== 'undefined'
-        });
-    });
-}, _PlannerTaskSetCommand_initOptions = function _PlannerTaskSetCommand_initOptions() {
-    this.options.unshift({ option: '-i, --id <id>' }, { option: '-t, --title [title]' }, { option: '--planId [planId]' }, { option: '--planTitle [planTitle]' }, { option: '--rosterId [rosterId]' }, { option: '--ownerGroupId [ownerGroupId]' }, { option: '--ownerGroupName [ownerGroupName]' }, { option: '--bucketId [bucketId]' }, { option: '--bucketName [bucketName]' }, { option: '--startDateTime [startDateTime]' }, { option: '--dueDateTime [dueDateTime]' }, { option: '--percentComplete [percentComplete]' }, { option: '--assignedToUserIds [assignedToUserIds]' }, { option: '--assignedToUserNames [assignedToUserNames]' }, { option: '--assigneePriority [assigneePriority]' }, { option: '--description [description]' }, { option: '--appliedCategories [appliedCategories]' }, { option: '--orderHint [orderHint]' }, { option: '--priority [priority]', autocomplete: taskPriority.priorityValues });
-}, _PlannerTaskSetCommand_initValidators = function _PlannerTaskSetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.ownerGroupId && !validation.isValidGuid(args.options.ownerGroupId)) {
-            return `${args.options.ownerGroupId} is not a valid GUID`;
-        }
-        if (args.options.startDateTime && !validation.isValidISODateTime(args.options.startDateTime)) {
-            return 'The startDateTime is not a valid ISO date string';
-        }
-        if (args.options.dueDateTime && !validation.isValidISODateTime(args.options.dueDateTime)) {
-            return 'The dueDateTime is not a valid ISO date string';
-        }
-        if (args.options.percentComplete && isNaN(args.options.percentComplete)) {
-            return `percentComplete is not a number`;
-        }
-        if (args.options.percentComplete && (args.options.percentComplete < 0 || args.options.percentComplete > 100)) {
-            return `percentComplete should be between 0 and 100`;
-        }
-        if (args.options.assignedToUserIds) {
-            const isValidGUIDArrayResult = validation.isValidGuidArray(args.options.assignedToUserIds);
-            if (isValidGUIDArrayResult !== true) {
-                return `The following GUIDs are invalid for the option 'assignedToUserIds': ${isValidGUIDArrayResult}.`;
-            }
-        }
-        if (args.options.assignedToUserNames) {
-            const isValidUPNArrayResult = validation.isValidUserPrincipalNameArray(args.options.assignedToUserNames);
-            if (isValidUPNArrayResult !== true) {
-                return `The following user principal names are invalid for the option 'assignedToUserNames': ${isValidUPNArrayResult}.`;
-            }
-        }
-        if (args.options.appliedCategories && args.options.appliedCategories.split(',').filter(category => this.allowedAppliedCategories.indexOf(category.toLocaleLowerCase()) < 0).length !== 0) {
-            return 'The appliedCategories contains invalid value. Specify either category1, category2, category3, category4, category5 and/or category6 as properties';
-        }
-        if (args.options.priority !== undefined) {
-            if (typeof args.options.priority === "number") {
-                if (isNaN(args.options.priority) || args.options.priority < 0 || args.options.priority > 10 || !Number.isInteger(args.options.priority)) {
-                    return 'priority should be an integer between 0 and 10.';
-                }
-            }
-            else if (taskPriority.priorityValues.map(l => l.toLowerCase()).indexOf(args.options.priority.toString().toLowerCase()) === -1) {
-                return `${args.options.priority} is not a valid priority value. Allowed values are ${taskPriority.priorityValues.join('|')}.`;
-            }
-        }
-        return true;
-    });
-}, _PlannerTaskSetCommand_initOptionSets = function _PlannerTaskSetCommand_initOptionSets() {
-    this.optionSets.push({
-        options: ['bucketId', 'bucketName'],
-        runsWhen: (args) => {
-            return args.options.bucketId || args.options.bucketName;
-        }
-    }, {
-        options: ['planId', 'planTitle', 'rosterId'],
-        runsWhen: (args) => {
-            return args.options.bucketName !== undefined;
-        }
-    }, {
-        options: ['ownerGroupId', 'ownerGroupName'],
-        runsWhen: (args) => {
-            return args.options.planTitle !== undefined;
-        }
-    }, {
-        options: ['assignedToUserIds', 'assignedToUserNames'],
-        runsWhen: (args) => {
-            return args.options.assignedToUserIds || args.options.assignedToUserNames;
-        }
-    });
-}, _PlannerTaskSetCommand_initTypes = function _PlannerTaskSetCommand_initTypes() {
-    this.types.string.push('id', 'title', 'planId', 'planTitle', 'ownerGroupId', 'ownerGroupName', 'bucketId', 'bucketName', 'description', 'assigneePriority', 'orderHint', 'rosterId', 'startDateTime', 'dueDateTime', 'assignedToUserIds', 'assignedToUserNames', 'assignments', 'appliedCategories');
-};
 export default new PlannerTaskSetCommand();
 //# sourceMappingURL=task-set.js.map

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

@@ -1,15 +1,31 @@
-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 _PurviewAuditLogListCommand_instances, _PurviewAuditLogListCommand_initTelemetry, _PurviewAuditLogListCommand_initOptions, _PurviewAuditLogListCommand_initValidators;
+import { z } from 'zod';
 import Auth from '../../../../Auth.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { accessToken } from '../../../../utils/accessToken.js';
 import { validation } from '../../../../utils/validation.js';
 import O365MgmtCommand from '../../../base/O365MgmtCommand.js';
 import commands from '../../commands.js';
+const contentTypeOptions = ['AzureActiveDirectory', 'Exchange', 'SharePoint', 'General', 'DLP'];
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    contentType: z.enum(contentTypeOptions),
+    startTime: z.string().refine(val => validation.isValidISODateTime(val), {
+        error: 'The value is not a valid ISO date time string.'
+    }).refine(val => {
+        const lowerDateLimit = new Date();
+        lowerDateLimit.setDate(lowerDateLimit.getDate() - 7);
+        lowerDateLimit.setHours(lowerDateLimit.getHours() - 1);
+        return new Date(val) >= lowerDateLimit;
+    }, {
+        error: 'startTime value cannot be more than 7 days in the past.'
+    }).optional(),
+    endTime: z.string().refine(val => validation.isValidISODateTime(val), {
+        error: 'The value is not a valid ISO date time string.'
+    }).refine(val => new Date(val) <= new Date(), {
+        error: 'endTime value cannot be in the future.'
+    }).optional()
+});
 class PurviewAuditLogListCommand extends O365MgmtCommand {
     get name() {
         return commands.AUDITLOG_LIST;
@@ -17,17 +33,23 @@ class PurviewAuditLogListCommand extends O365MgmtCommand {
     get description() {
         return 'Lists audit logs within your tenant';
     }
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => {
+            if (opts.startTime && opts.endTime) {
+                return new Date(opts.startTime) < new Date(opts.endTime);
+            }
+            return true;
+        }, {
+            error: 'startTime value must be before endTime.'
+        });
+    }
     defaultProperties() {
         return ['CreationTime', 'UserId', 'Operation', 'ObjectId'];
     }
-    constructor() {
-        super();
-        _PurviewAuditLogListCommand_instances.add(this);
-        this.contentTypeOptions = ['AzureActiveDirectory', 'Exchange', 'SharePoint', 'General', 'DLP'];
-        __classPrivateFieldGet(this, _PurviewAuditLogListCommand_instances, "m", _PurviewAuditLogListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _PurviewAuditLogListCommand_instances, "m", _PurviewAuditLogListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _PurviewAuditLogListCommand_instances, "m", _PurviewAuditLogListCommand_initValidators).call(this);
-    }
     async commandAction(logger, args) {
         // If we don't create a now object, start and end date can be an few extra ms apart due to execution time between code lines
         const now = new Date();
@@ -136,51 +158,5 @@ class PurviewAuditLogListCommand extends O365MgmtCommand {
         return 0;
     }
 }
-_PurviewAuditLogListCommand_instances = new WeakSet(), _PurviewAuditLogListCommand_initTelemetry = function _PurviewAuditLogListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            startTime: typeof args.options.startTime !== 'undefined',
-            endTime: typeof args.options.endTime !== 'undefined'
-        });
-    });
-}, _PurviewAuditLogListCommand_initOptions = function _PurviewAuditLogListCommand_initOptions() {
-    this.options.unshift({
-        option: '--contentType <contentType>',
-        autocomplete: this.contentTypeOptions
-    }, {
-        option: '--startTime [startTime]'
-    }, {
-        option: '--endTime [endTime]'
-    });
-}, _PurviewAuditLogListCommand_initValidators = function _PurviewAuditLogListCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (this.contentTypeOptions.indexOf(args.options.contentType) === -1) {
-            return `'${args.options.contentType}' is not a valid contentType value. Allowed values: ${this.contentTypeOptions}.`;
-        }
-        if (args.options.startTime) {
-            if (!validation.isValidISODateTime(args.options.startTime)) {
-                return `'${args.options.startTime}' is not a valid ISO date time string.`;
-            }
-            const lowerDateLimit = new Date();
-            lowerDateLimit.setDate(lowerDateLimit.getDate() - 7);
-            lowerDateLimit.setHours(lowerDateLimit.getHours() - 1); // Min date is 7 days ago, however there seems to be an 1h margin
-            if (new Date(args.options.startTime) < lowerDateLimit) {
-                return 'startTime value cannot be more than 7 days in the past.';
-            }
-        }
-        if (args.options.endTime) {
-            if (!validation.isValidISODateTime(args.options.endTime)) {
-                return `'${args.options.endTime}' is not a valid ISO date time string.`;
-            }
-            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 value must be before endTime.';
-        }
-        return true;
-    });
-};
 export default new PurviewAuditLogListCommand();
 //# sourceMappingURL=auditlog-list.js.map

package/dist/m365/purview/commands/retentionevent/retentionevent-add.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 _PurviewRetentionEventAddCommand_instances, _PurviewRetentionEventAddCommand_initOptions, _PurviewRetentionEventAddCommand_initValidators, _PurviewRetentionEventAddCommand_initTelemetry, _PurviewRetentionEventAddCommand_initOptionSets;
+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 { validation } from '../../../../utils/validation.js';
 import { odata } from '../../../../utils/odata.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    displayName: z.string().alias('n'),
+    eventTypeId: z.string().optional().alias('i'),
+    eventTypeName: z.string().optional().alias('e'),
+    description: z.string().optional().alias('d'),
+    triggerDateTime: z.string().optional()
+        .refine(val => val === undefined || validation.isValidISODateTime(val), {
+        message: 'The triggerDateTime is not a valid ISO date string'
+    }),
+    assetIds: z.string().optional().alias('a'),
+    keywords: z.string().optional().alias('k')
+});
 class PurviewRetentionEventAddCommand extends GraphCommand {
     get name() {
         return commands.RETENTIONEVENT_ADD;
@@ -16,13 +25,25 @@ class PurviewRetentionEventAddCommand extends GraphCommand {
     get description() {
         return 'Creates a retention event';
     }
-    constructor() {
-        super();
-        _PurviewRetentionEventAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _PurviewRetentionEventAddCommand_instances, "m", _PurviewRetentionEventAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _PurviewRetentionEventAddCommand_instances, "m", _PurviewRetentionEventAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _PurviewRetentionEventAddCommand_instances, "m", _PurviewRetentionEventAddCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _PurviewRetentionEventAddCommand_instances, "m", _PurviewRetentionEventAddCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.eventTypeId, opts.eventTypeName].filter(x => x !== undefined).length === 1, {
+            error: `Specify either 'eventTypeId' or 'eventTypeName', but not both.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['eventTypeId', 'eventTypeName']
+            }
+        })
+            .refine(opts => opts.assetIds !== undefined || opts.keywords !== undefined, {
+            error: 'Specify assetIds and/or keywords, but at least one.',
+            params: {
+                customCode: 'optionSet',
+                options: ['assetIds', 'keywords']
+            }
+        });
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -74,45 +95,5 @@ class PurviewRetentionEventAddCommand extends GraphCommand {
         return eventTypes[0].id;
     }
 }
-_PurviewRetentionEventAddCommand_instances = new WeakSet(), _PurviewRetentionEventAddCommand_initOptions = function _PurviewRetentionEventAddCommand_initOptions() {
-    this.options.unshift({
-        option: '-n, --displayName <displayName>'
-    }, {
-        option: '-i, --eventTypeId [eventTypeId]'
-    }, {
-        option: '-e, --eventTypeName [eventTypeName]'
-    }, {
-        option: '-d, --description [description]'
-    }, {
-        option: '--triggerDateTime [triggerDateTime]'
-    }, {
-        option: '-a, --assetIds [assetIds]'
-    }, {
-        option: '-k, --keywords [keywords]'
-    });
-}, _PurviewRetentionEventAddCommand_initValidators = function _PurviewRetentionEventAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.triggerDateTime && !validation.isValidISODateTime(args.options.triggerDateTime)) {
-            return 'The triggerDateTime is not a valid ISO date string';
-        }
-        if (!args.options.assetIds && !args.options.keywords) {
-            return 'Specify assetIds and/or keywords, but at least one.';
-        }
-        return true;
-    });
-}, _PurviewRetentionEventAddCommand_initTelemetry = function _PurviewRetentionEventAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            description: typeof args.options.description !== 'undefined',
-            triggerDateTime: typeof args.options.triggerDateTime !== 'undefined',
-            eventTypeId: typeof args.options.eventTypeId !== 'undefined',
-            eventTypeName: typeof args.options.eventTypeName !== 'undefined',
-            assetIds: typeof args.options.assetIds !== 'undefined',
-            keywords: typeof args.options.keywords !== 'undefined'
-        });
-    });
-}, _PurviewRetentionEventAddCommand_initOptionSets = function _PurviewRetentionEventAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['eventTypeId', 'eventTypeName'] });
-};
 export default new PurviewRetentionEventAddCommand();
 //# sourceMappingURL=retentionevent-add.js.map

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

@@ -1,13 +1,15 @@
-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 _PurviewRetentionEventGetCommand_instances, _PurviewRetentionEventGetCommand_initOptions, _PurviewRetentionEventGetCommand_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';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    id: z.string().refine(val => validation.isValidGuid(val), {
+        message: 'The value must be a valid GUID.'
+    }).alias('i')
+});
 class PurviewRetentionEventGetCommand extends GraphCommand {
     get name() {
         return commands.RETENTIONEVENT_GET;
@@ -15,11 +17,8 @@ class PurviewRetentionEventGetCommand extends GraphCommand {
     get description() {
         return 'Gets a retention event';
     }
-    constructor() {
-        super();
-        _PurviewRetentionEventGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _PurviewRetentionEventGetCommand_instances, "m", _PurviewRetentionEventGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _PurviewRetentionEventGetCommand_instances, "m", _PurviewRetentionEventGetCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -41,17 +40,5 @@ class PurviewRetentionEventGetCommand extends GraphCommand {
         }
     }
 }
-_PurviewRetentionEventGetCommand_instances = new WeakSet(), _PurviewRetentionEventGetCommand_initOptions = function _PurviewRetentionEventGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id <id>'
-    });
-}, _PurviewRetentionEventGetCommand_initValidators = function _PurviewRetentionEventGetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (!validation.isValidGuid(args.options.id)) {
-            return `'${args.options.id}' is not a valid GUID.`;
-        }
-        return true;
-    });
-};
 export default new PurviewRetentionEventGetCommand();
 //# sourceMappingURL=retentionevent-get.js.map

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

@@ -1,14 +1,17 @@
-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 _PurviewRetentionEventRemoveCommand_instances, _PurviewRetentionEventRemoveCommand_initTelemetry, _PurviewRetentionEventRemoveCommand_initOptions, _PurviewRetentionEventRemoveCommand_initValidators;
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.js';
+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';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    id: z.string().refine(val => validation.isValidGuid(val), {
+        message: 'The value must be a valid GUID.'
+    }).alias('i'),
+    force: z.boolean().optional().alias('f')
+});
 class PurviewRetentionEventRemoveCommand extends GraphCommand {
     get name() {
         return commands.RETENTIONEVENT_REMOVE;
@@ -16,12 +19,8 @@ class PurviewRetentionEventRemoveCommand extends GraphCommand {
     get description() {
         return 'Deletes a retention event';
     }
-    constructor() {
-        super();
-        _PurviewRetentionEventRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _PurviewRetentionEventRemoveCommand_instances, "m", _PurviewRetentionEventRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _PurviewRetentionEventRemoveCommand_instances, "m", _PurviewRetentionEventRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _PurviewRetentionEventRemoveCommand_instances, "m", _PurviewRetentionEventRemoveCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (args.options.force) {
@@ -50,25 +49,5 @@ class PurviewRetentionEventRemoveCommand extends GraphCommand {
         }
     }
 }
-_PurviewRetentionEventRemoveCommand_instances = new WeakSet(), _PurviewRetentionEventRemoveCommand_initTelemetry = function _PurviewRetentionEventRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            force: !!args.options.force
-        });
-    });
-}, _PurviewRetentionEventRemoveCommand_initOptions = function _PurviewRetentionEventRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id <id>'
-    }, {
-        option: '-f, --force'
-    });
-}, _PurviewRetentionEventRemoveCommand_initValidators = function _PurviewRetentionEventRemoveCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (!validation.isValidGuid(args.options.id)) {
-            return `'${args.options.id}' is not a valid GUID.`;
-        }
-        return true;
-    });
-};
 export default new PurviewRetentionEventRemoveCommand();
 //# sourceMappingURL=retentionevent-remove.js.map