@pnp/cli-microsoft365 11.4.0-beta.87732f5 → 11.4.0-beta.f54089d

package/dist/m365/spo/commands/web/web-alert-list.js

@@ -1,34 +1,27 @@
-import commands from '../../commands.js';
-import SpoCommand from '../../../base/SpoCommand.js';
-import { globalOptionsZod } from '../../../../Command.js';
 import { z } from 'zod';
-import { zod } from '../../../../utils/zod.js';
-import { validation } from '../../../../utils/validation.js';
-import { spo } from '../../../../utils/spo.js';
+import { cli } from '../../../../cli/cli.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import { entraUser } from '../../../../utils/entraUser.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
-import { cli } from '../../../../cli/cli.js';
-export const options = globalOptionsZod
-    .extend({
-    webUrl: zod.alias('u', z.string()
-        .refine(url => validation.isValidSharePointUrl(url) === true, url => ({
-        message: `'${url}' is not a valid SharePoint site URL.`
-    }))),
-    listId: z.string()
-        .refine(id => validation.isValidGuid(id), id => ({
-        message: `'${id}' is not a valid GUID.`
-    })).optional(),
+import { spo } from '../../../../utils/spo.js';
+import { validation } from '../../../../utils/validation.js';
+import SpoCommand from '../../../base/SpoCommand.js';
+import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    webUrl: z.string().alias('u')
+        .refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `'${e.input}' is not a valid SharePoint site URL.`
+    }),
+    listId: z.uuid().optional(),
     listUrl: z.string().optional(),
     listTitle: z.string().optional(),
-    userName: z.string().refine(upn => validation.isValidUserPrincipalName(upn), upn => ({
-        message: `'${upn}' is not a valid UPN.`
-    })).optional(),
-    userId: z.string().refine(id => validation.isValidGuid(id), id => ({
-        message: `'${id}' is not a valid GUID.`
-    })).optional()
-})
-    .strict();
+    userName: z.string().optional().refine(upn => typeof upn === 'undefined' || validation.isValidUserPrincipalName(upn), {
+        error: e => `'${e.input}' is not a valid UPN.`
+    }),
+    userId: z.uuid().optional()
+});
 class SpoWebAlertListCommand extends SpoCommand {
     get name() {
         return commands.WEB_ALERT_LIST;
@@ -45,10 +38,10 @@ class SpoWebAlertListCommand extends SpoCommand {
     getRefinedSchema(schema) {
         return schema
             .refine(options => [options.listId, options.listUrl, options.listTitle].filter(x => x !== undefined).length <= 1, {
-            message: `Specify either listId, listUrl, or listTitle, but not more than one.`
+            error: `Specify either listId, listUrl, or listTitle, but not more than one.`
         })
             .refine(options => [options.userName, options.userId].filter(x => x !== undefined).length <= 1, {
-            message: `Specify either userName or userId, but not both.`
+            error: `Specify either userName or userId, but not both.`
         });
     }
     async commandAction(logger, args) {

package/dist/m365/spo/commands/web/web-alert-remove.js

@@ -1,25 +1,20 @@
-import commands from '../../commands.js';
-import SpoCommand from '../../../base/SpoCommand.js';
-import { globalOptionsZod } from '../../../../Command.js';
 import { z } from 'zod';
-import { zod } from '../../../../utils/zod.js';
-import { validation } from '../../../../utils/validation.js';
-import { formatting } from '../../../../utils/formatting.js';
-import request from '../../../../request.js';
 import { cli } from '../../../../cli/cli.js';
-const options = globalOptionsZod
-    .extend({
-    webUrl: zod.alias('u', z.string()
-        .refine(url => validation.isValidSharePointUrl(url) === true, url => ({
-        message: `'${url}' is not a valid SharePoint URL.`
-    }))),
-    id: z.string()
-        .refine(id => validation.isValidGuid(id), id => ({
-        message: `'${id}' is not a valid GUID.`
-    })),
-    force: zod.alias('f', z.boolean().optional())
-})
-    .strict();
+import { globalOptionsZod } from '../../../../Command.js';
+import request from '../../../../request.js';
+import { formatting } from '../../../../utils/formatting.js';
+import { validation } from '../../../../utils/validation.js';
+import SpoCommand from '../../../base/SpoCommand.js';
+import commands from '../../commands.js';
+const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    webUrl: z.string().alias('u')
+        .refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `'${e.input}' is not a valid SharePoint URL.`
+    }),
+    id: z.uuid(),
+    force: z.boolean().optional().alias('f')
+});
 class SpoWebAlertRemoveCommand extends SpoCommand {
     get name() {
         return commands.WEB_ALERT_REMOVE;

package/dist/m365/spo/commands.js

@@ -141,6 +141,7 @@ export default {
     LIST_CONTENTTYPE_REMOVE: `${prefix} list contenttype remove`,
     LIST_CONTENTTYPE_DEFAULT_SET: `${prefix} list contenttype default set`,
     LIST_DEFAULTVALUE_CLEAR: `${prefix} list defaultvalue clear`,
+    LIST_DEFAULTVALUE_GET: `${prefix} list defaultvalue get`,
     LIST_DEFAULTVALUE_LIST: `${prefix} list defaultvalue list`,
     LIST_DEFAULTVALUE_REMOVE: `${prefix} list defaultvalue remove`,
     LIST_DEFAULTVALUE_SET: `${prefix} list defaultvalue set`,

package/dist/m365/spp/commands/model/model-apply.js

@@ -7,31 +7,25 @@ import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
 import { z } from 'zod';
 import { globalOptionsZod } from '../../../../Command.js';
-import { zod } from '../../../../utils/zod.js';
-const options = globalOptionsZod
-    .extend({
-    contentCenterUrl: zod.alias('c', z.string()
-        .refine(url => validation.isValidSharePointUrl(url) === true, url => ({
-        message: `'${url}' is not a valid SharePoint Online site URL.`
-    }))),
-    webUrl: zod.alias('u', z.string()
-        .refine(url => validation.isValidSharePointUrl(url) === true, url => ({
-        message: `'${url}' is not a valid SharePoint Online site URL.`
-    }))),
-    id: zod.alias('i', z.string()
-        .refine(id => validation.isValidGuid(id) === true, id => ({
-        message: `${id} is not a valid GUID.`
-    })).optional()),
-    title: zod.alias('t', z.string()).optional(),
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    contentCenterUrl: z.string()
+        .refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `'${e.input}' is not a valid SharePoint Online site URL.`
+    })
+        .alias('c'),
+    webUrl: z.string()
+        .refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `'${e.input}' is not a valid SharePoint Online site URL.`
+    })
+        .alias('u'),
+    id: z.uuid().optional().alias('i'),
+    title: z.string().optional().alias('t'),
     listTitle: z.string().optional(),
-    listId: z.string()
-        .refine(listId => validation.isValidGuid(listId) === true, listId => ({
-        message: `${listId} is not a valid GUID.`
-    })).optional(),
+    listId: z.uuid().optional(),
     listUrl: z.string().optional(),
     viewOption: z.enum(['NewViewAsDefault', 'DoNotChangeDefault', 'TileViewAsDefault']).optional()
-})
-    .strict();
+});
 class SppModelApplyCommand extends SpoCommand {
     get name() {
         return commands.MODEL_APPLY;
@@ -45,10 +39,10 @@ class SppModelApplyCommand extends SpoCommand {
     getRefinedSchema(schema) {
         return schema
             .refine(options => [options.id, options.title].filter(x => x !== undefined).length === 1, {
-            message: `Specify exactly one of the following options: 'id' or 'title'.`
+            error: `Specify exactly one of the following options: 'id' or 'title'.`
         })
             .refine(options => [options.listTitle, options.listId, options.listUrl].filter(x => x !== undefined).length === 1, {
-            message: `Specify exactly one of the following options: 'listTitle', 'listId' or 'listUrl'.`
+            error: `Specify exactly one of the following options: 'listTitle', 'listId' or 'listUrl'.`
         });
     }
     async commandAction(logger, args) {

package/dist/m365/teams/commands/callrecord/callrecord-list.js

@@ -5,12 +5,9 @@ import GraphApplicationCommand from '../../../base/GraphApplicationCommand.js';
 import { validation } from '../../../../utils/validation.js';
 import { entraUser } from '../../../../utils/entraUser.js';
 import { odata } from '../../../../utils/odata.js';
-const options = globalOptionsZod
-    .extend({
-    userId: z.string()
-        .refine((val) => validation.isValidGuid(val), {
-        message: 'Invalid GUID.'
-    }).optional(),
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    userId: z.uuid().optional(),
     userName: z.string()
         .refine((val) => validation.isValidUserPrincipalName(val), {
         message: 'Invalid user principal name.'
@@ -41,8 +38,7 @@ const options = globalOptionsZod
     }, {
         message: 'Date must be a valid ISO date within the last 30 days and not in the future.'
     }).optional()
-})
-    .strict();
+});
 class TeamsCallRecordListCommand extends GraphApplicationCommand {
     get name() {
         return commands.CALLRECORD_LIST;
@@ -59,7 +55,7 @@ class TeamsCallRecordListCommand extends GraphApplicationCommand {
     getRefinedSchema(schema) {
         return schema
             .refine((options) => [options.userId, options.userName].filter(o => o !== undefined).length <= 1, {
-            message: 'Use one of the following options: userId or userName but not both.'
+            error: 'Use one of the following options: userId or userName but not both.'
         })
             .refine((options) => [options.startDateTime, options.endDateTime].filter(o => o !== undefined).length <= 1 || new Date(options.startDateTime) < new Date(options.endDateTime), {
             message: 'Value of startDateTime, must be before endDateTime.'

package/dist/m365/teams/commands/chat/chat-message-list.js

@@ -1,13 +1,22 @@
-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 _TeamsChatMessageListCommand_instances, _TeamsChatMessageListCommand_initOptions, _TeamsChatMessageListCommand_initValidators;
 import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+import { globalOptionsZod } from '../../../../Command.js';
+import { z } from 'zod';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    chatId: z.string()
+        .refine(id => validation.isValidTeamsChatId(id), {
+        error: e => `'${e.input}' is not a valid value for option chatId.`
+    })
+        .alias('i'),
+    endDateTime: z.string()
+        .refine(time => validation.isValidISODateTime(time), {
+        error: e => `'${e.input}' is not a valid ISO date-time string for option endDateTime.`
+    })
+        .optional()
+});
 class TeamsChatMessageListCommand extends GraphCommand {
     get name() {
         return commands.CHAT_MESSAGE_LIST;
@@ -16,19 +25,21 @@ class TeamsChatMessageListCommand extends GraphCommand {
         return 'Lists all messages from a chat';
     }
     defaultProperties() {
-        return ['id', 'shortBody'];
+        return ['id', 'createdDateTime', 'shortBody'];
     }
-    constructor() {
-        super();
-        _TeamsChatMessageListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _TeamsChatMessageListCommand_instances, "m", _TeamsChatMessageListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _TeamsChatMessageListCommand_instances, "m", _TeamsChatMessageListCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
-        const endpoint = `${this.resource}/v1.0/chats/${args.options.chatId}/messages`;
         try {
-            const items = await odata.getAllItems(endpoint);
-            if (args.options.output !== 'json') {
+            let apiUrl = `${this.resource}/v1.0/chats/${args.options.chatId}/messages`;
+            if (args.options.endDateTime) {
+                // You can only filter results if the request URL contains the $orderby and $filter query parameters configured for the same property;
+                // otherwise, the $filter query option is ignored.
+                apiUrl += `?$filter=createdDateTime lt ${args.options.endDateTime}&$orderby=createdDateTime desc`;
+            }
+            const items = await odata.getAllItems(apiUrl);
+            if (args.options.output && args.options.output !== 'json') {
                 items.forEach(i => {
                     // hoist the content to body for readability
                     i.body = i.body.content;
@@ -53,17 +64,5 @@ class TeamsChatMessageListCommand extends GraphCommand {
         }
     }
 }
-_TeamsChatMessageListCommand_instances = new WeakSet(), _TeamsChatMessageListCommand_initOptions = function _TeamsChatMessageListCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --chatId <chatId>'
-    });
-}, _TeamsChatMessageListCommand_initValidators = function _TeamsChatMessageListCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (!validation.isValidTeamsChatId(args.options.chatId)) {
-            return `${args.options.chatId} is not a valid Teams chat ID`;
-        }
-        return true;
-    });
-};
 export default new TeamsChatMessageListCommand();
 //# sourceMappingURL=chat-message-list.js.map

package/dist/m365/teams/commands/chat/chat-message-send.js

@@ -23,6 +23,7 @@ class TeamsChatMessageSendCommand extends GraphDelegatedCommand {
     constructor() {
         super();
         _TeamsChatMessageSendCommand_instances.add(this);
+        this.contentTypes = ['text', 'html'];
         __classPrivateFieldGet(this, _TeamsChatMessageSendCommand_instances, "m", _TeamsChatMessageSendCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _TeamsChatMessageSendCommand_instances, "m", _TeamsChatMessageSendCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _TeamsChatMessageSendCommand_instances, "m", _TeamsChatMessageSendCommand_initValidators).call(this);
@@ -47,7 +48,7 @@ class TeamsChatMessageSendCommand extends GraphDelegatedCommand {
     }
     async ensureChatIdByUserEmails(userEmailsOption) {
         const userEmails = userEmailsOption.trim().toLowerCase().split(',').filter(e => e && e !== '');
-        const currentUserEmail = accessToken.getUserNameFromAccessToken(auth.connection.accessTokens[this.resource].accessToken).toLowerCase();
+        const currentUserEmail = accessToken.getUserNameFromAccessToken(auth.connection.accessTokens[auth.defaultResource].accessToken).toLowerCase();
         const existingChats = await chatUtil.findExistingChatsByParticipants([currentUserEmail, ...userEmails]);
         if (!existingChats || existingChats.length === 0) {
             const chat = await this.createConversation([currentUserEmail, ...userEmails]);
@@ -112,11 +113,12 @@ class TeamsChatMessageSendCommand extends GraphDelegatedCommand {
             url: `${this.resource}/v1.0/chats/${chatId}/messages`,
             headers: {
                 accept: 'application/json;odata.metadata=none',
-                'content-type': 'application/json;odata=nometadata'
+                'content-type': 'application/json'
             },
             responseType: 'json',
             data: {
                 body: {
+                    contentType: args.options.contentType || 'text',
                     content: args.options.message
                 }
             }
@@ -129,7 +131,8 @@ _TeamsChatMessageSendCommand_instances = new WeakSet(), _TeamsChatMessageSendCom
         Object.assign(this.telemetryProperties, {
             chatId: typeof args.options.chatId !== 'undefined',
             userEmails: typeof args.options.userEmails !== 'undefined',
-            chatName: typeof args.options.chatName !== 'undefined'
+            chatName: typeof args.options.chatName !== 'undefined',
+            contentType: args.options.contentType ?? 'text'
         });
     });
 }, _TeamsChatMessageSendCommand_initOptions = function _TeamsChatMessageSendCommand_initOptions() {
@@ -141,6 +144,9 @@ _TeamsChatMessageSendCommand_instances = new WeakSet(), _TeamsChatMessageSendCom
         option: '--chatName [chatName]'
     }, {
         option: '-m, --message <message>'
+    }, {
+        option: '--contentType [contentType]',
+        autocomplete: this.contentTypes
     });
 }, _TeamsChatMessageSendCommand_initValidators = function _TeamsChatMessageSendCommand_initValidators() {
     this.validators.push(async (args) => {
@@ -153,6 +159,9 @@ _TeamsChatMessageSendCommand_instances = new WeakSet(), _TeamsChatMessageSendCom
                 return `${args.options.userEmails} contains one or more invalid email addresses.`;
             }
         }
+        if (args.options.contentType && !this.contentTypes.includes(args.options.contentType)) {
+            return `'${args.options.contentType}' is not a valid value for option contentType. Allowed values are ${this.contentTypes.join(', ')}.`;
+        }
         return true;
     });
 }, _TeamsChatMessageSendCommand_initOptionSets = function _TeamsChatMessageSendCommand_initOptionSets() {

package/dist/m365/teams/commands/chat/chatUtil.js

@@ -3,7 +3,7 @@ import { odata } from '../../../../utils/odata.js';
 export const chatUtil = {
     /**
      * Finds existing Microsoft Teams chats by participants, using the Microsoft Graph
-     * @param expectedMemberEmails a string array of participant emailaddresses
+     * @param expectedMemberEmails a string array of participant email addresses
      * @param logger a logger to pipe into the graph request odata helper.
      */
     async findExistingChatsByParticipants(expectedMemberEmails) {

package/dist/m365/tenant/commands/people/people-pronouns-set.js

@@ -1,14 +1,12 @@
 import { z } from 'zod';
 import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
-import { zod } from '../../../../utils/zod.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-const options = globalOptionsZod
-    .extend({
-    enabled: zod.alias('e', z.boolean())
-})
-    .strict();
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    enabled: z.boolean().alias('e')
+});
 class TenantPeoplePronounsSetCommand extends GraphCommand {
     get name() {
         return commands.PEOPLE_PRONOUNS_SET;

package/dist/m365/tenant/commands/report/report-settings-set.js

@@ -3,12 +3,10 @@ import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 import { z } from 'zod';
 import { globalOptionsZod } from '../../../../Command.js';
-import { zod } from '../../../../utils/zod.js';
-const options = globalOptionsZod
-    .extend({
-    displayConcealedNames: zod.alias('d', z.boolean())
-})
-    .strict();
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    displayConcealedNames: z.boolean().alias('d')
+});
 class TenantReportSettingsSetCommand extends GraphCommand {
     get name() {
         return commands.REPORT_SETTINGS_SET;

package/dist/m365/viva/commands/engage/engage-community-user-add.js

@@ -1,6 +1,5 @@
 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';
@@ -8,25 +7,21 @@ import { vivaEngage } from '../../../../utils/vivaEngage.js';
 import request from '../../../../request.js';
 import { entraUser } from '../../../../utils/entraUser.js';
 import { formatting } from '../../../../utils/formatting.js';
-const options = globalOptionsZod
-    .extend({
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
     communityId: z.string().optional(),
-    communityDisplayName: zod.alias('n', z.string().optional()),
-    entraGroupId: z.string()
-        .refine(id => validation.isValidGuid(id), id => ({
-        message: `'${id}' is not a valid GUID.`
-    })).optional(),
+    communityDisplayName: z.string().optional().alias('n'),
+    entraGroupId: z.uuid().optional(),
     ids: z.string()
-        .refine(ids => validation.isValidGuidArray(ids) === true, invalidIds => ({
-        message: `The following GUIDs are invalid: ${invalidIds}.`
-    })).optional(),
+        .refine(ids => validation.isValidGuidArray(ids) === true, {
+        error: e => `The following GUIDs are invalid: ${e.input}.`
+    }).optional(),
     userNames: z.string()
-        .refine(userNames => validation.isValidUserPrincipalNameArray(userNames) === true, invalidUserNames => ({
-        message: `The following user principal names are invalid: ${invalidUserNames}.`
-    })).optional(),
-    role: zod.alias('r', z.enum(['Admin', 'Member']))
-})
-    .strict();
+        .refine(userNames => validation.isValidUserPrincipalNameArray(userNames) === true, {
+        error: e => `The following user principal names are invalid: ${e.input}.`
+    }).optional(),
+    role: z.enum(['Admin', 'Member']).alias('r')
+});
 class VivaEngageCommunityUserAddCommand extends GraphCommand {
     get name() {
         return commands.ENGAGE_COMMUNITY_USER_ADD;
@@ -40,16 +35,16 @@ class VivaEngageCommunityUserAddCommand extends GraphCommand {
     getRefinedSchema(schema) {
         return schema
             .refine(options => [options.communityId, options.communityDisplayName, options.entraGroupId].filter(x => x !== undefined).length === 1, {
-            message: 'Specify either communityId, communityDisplayName, or entraGroupId, but not multiple.'
+            error: 'Specify either communityId, communityDisplayName, or entraGroupId, but not multiple.'
         })
             .refine(options => options.communityId || options.communityDisplayName || options.entraGroupId, {
-            message: 'Specify at least one of communityId, communityDisplayName, or entraGroupId.'
+            error: 'Specify at least one of communityId, communityDisplayName, or entraGroupId.'
         })
             .refine(options => options.ids || options.userNames, {
-            message: 'Specify either of ids or userNames.'
+            error: 'Specify either of ids or userNames.'
         })
-            .refine(options => options.userNames !== undefined || options.ids !== undefined, {
-            message: 'Specify either ids or userNames, but not both.'
+            .refine(options => typeof options.userNames !== 'undefined' || typeof options.ids !== 'undefined', {
+            error: 'Specify either ids or userNames, but not both.'
         });
     }
     async commandAction(logger, args) {

package/dist/m365/viva/commands/engage/engage-community-user-list.js

@@ -1,22 +1,16 @@
 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 { vivaEngage } from '../../../../utils/vivaEngage.js';
 import { odata } from '../../../../utils/odata.js';
-const options = globalOptionsZod
-    .extend({
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
     communityId: z.string().optional(),
-    communityDisplayName: zod.alias('n', z.string().optional()),
-    entraGroupId: z.string()
-        .refine(name => validation.isValidGuid(name), name => ({
-        message: `'${name}' is not a valid GUID.`
-    })).optional(),
-    role: zod.alias('r', z.enum(['Admin', 'Member']).optional())
-})
-    .strict();
+    communityDisplayName: z.string().optional().alias('n'),
+    entraGroupId: z.uuid().optional(),
+    role: z.enum(['Admin', 'Member']).optional().alias('r')
+});
 class VivaEngageCommunityUserListCommand extends GraphCommand {
     get name() {
         return commands.ENGAGE_COMMUNITY_USER_LIST;
@@ -30,10 +24,10 @@ class VivaEngageCommunityUserListCommand extends GraphCommand {
     getRefinedSchema(schema) {
         return schema
             .refine(options => [options.communityId, options.communityDisplayName, options.entraGroupId].filter(x => x !== undefined).length === 1, {
-            message: 'Specify either communityId, communityDisplayName, or entraGroupId, but not multiple.'
+            error: 'Specify either communityId, communityDisplayName, or entraGroupId, but not multiple.'
         })
             .refine(options => options.communityId || options.communityDisplayName || options.entraGroupId, {
-            message: 'Specify at least one of communityId, communityDisplayName, or entraGroupId.'
+            error: 'Specify at least one of communityId, communityDisplayName, or entraGroupId.'
         });
     }
     defaultProperties() {

package/dist/m365/viva/commands/engage/engage-community-user-remove.js

@@ -1,6 +1,5 @@
 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';
@@ -8,25 +7,18 @@ import { vivaEngage } from '../../../../utils/vivaEngage.js';
 import request from '../../../../request.js';
 import { entraUser } from '../../../../utils/entraUser.js';
 import { cli } from '../../../../cli/cli.js';
-const options = globalOptionsZod
-    .extend({
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
     communityId: z.string().optional(),
-    communityDisplayName: zod.alias('n', z.string().optional()),
-    entraGroupId: z.string()
-        .refine(id => validation.isValidGuid(id), id => ({
-        message: `'${id}' is not a valid GUID.`
-    })).optional(),
-    id: z.string()
-        .refine(id => validation.isValidGuid(id), id => ({
-        message: `'${id}' is not a valid GUID.`
-    })).optional(),
+    communityDisplayName: z.string().optional().alias('n'),
+    entraGroupId: z.uuid().optional(),
+    id: z.uuid().optional(),
     userName: z.string()
-        .refine(userName => validation.isValidUserPrincipalName(userName), userName => ({
-        message: `'${userName}' is not a valid user principal name.`
-    })).optional(),
+        .refine(userName => validation.isValidUserPrincipalName(userName), {
+        error: e => `'${e.input}' is not a valid user principal name.`
+    }).optional(),
     force: z.boolean().optional()
-})
-    .strict();
+});
 class VivaEngageCommunityUserRemoveCommand extends GraphCommand {
     get name() {
         return commands.ENGAGE_COMMUNITY_USER_REMOVE;
@@ -40,16 +32,16 @@ class VivaEngageCommunityUserRemoveCommand extends GraphCommand {
     getRefinedSchema(schema) {
         return schema
             .refine(options => [options.communityId, options.communityDisplayName, options.entraGroupId].filter(x => x !== undefined).length === 1, {
-            message: 'Specify either communityId, communityDisplayName, or entraGroupId, but not multiple.'
+            error: 'Specify either communityId, communityDisplayName, or entraGroupId, but not multiple.'
         })
             .refine(options => options.communityId || options.communityDisplayName || options.entraGroupId, {
-            message: 'Specify at least one of communityId, communityDisplayName, or entraGroupId.'
+            error: 'Specify at least one of communityId, communityDisplayName, or entraGroupId.'
         })
             .refine(options => options.id || options.userName, {
-            message: 'Specify either of id or userName.'
+            error: 'Specify either of id or userName.'
         })
-            .refine(options => options.userName !== undefined || options.id !== undefined, {
-            message: 'Specify either id or userName, but not both.'
+            .refine(options => typeof options.userName !== 'undefined' || typeof options.id !== 'undefined', {
+            error: 'Specify either id or userName, but not both.'
         });
     }
     async commandAction(logger, args) {

package/dist/m365/viva/commands/engage/engage-role-member-list.js

@@ -1,19 +1,14 @@
 import { z } from 'zod';
 import { globalOptionsZod } from '../../../../Command.js';
-import { zod } from '../../../../utils/zod.js';
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-import { validation } from '../../../../utils/validation.js';
 import { vivaEngage } from '../../../../utils/vivaEngage.js';
-const options = globalOptionsZod
-    .extend({
-    roleId: zod.alias('i', z.string().refine(name => validation.isValidGuid(name), name => ({
-        message: `'${name}' is not a valid GUID.`
-    })).optional()),
-    roleName: zod.alias('n', z.string().optional())
-})
-    .strict();
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    roleId: z.uuid().optional().alias('i'),
+    roleName: z.string().optional().alias('n')
+});
 class VivaEngageRoleMemberListCommand extends GraphCommand {
     get name() {
         return commands.ENGAGE_ROLE_MEMBER_LIST;
@@ -27,7 +22,7 @@ class VivaEngageRoleMemberListCommand extends GraphCommand {
     getRefinedSchema(schema) {
         return schema
             .refine(options => [options.roleId, options.roleName].filter(x => x !== undefined).length === 1, {
-            message: 'Specify either roleId, or roleName, but not both.'
+            error: 'Specify either roleId, or roleName, but not both.'
         });
     }
     defaultProperties() {