@pnp/cli-microsoft365 12.0.0-beta.1752794 → 12.0.0-beta.445fe0a

package/dist/m365/spo/commands/group/group-get.js

@@ -1,14 +1,28 @@
-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 _SpoGroupGetCommand_instances, _SpoGroupGetCommand_initTelemetry, _SpoGroupGetCommand_initOptions, _SpoGroupGetCommand_initValidators, _SpoGroupGetCommand_initOptionSets;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
+import { zod } from '../../../../utils/zod.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+var AssociatedGroup;
+(function (AssociatedGroup) {
+    AssociatedGroup["Owner"] = "Owner";
+    AssociatedGroup["Member"] = "Member";
+    AssociatedGroup["Visitor"] = "Visitor";
+})(AssociatedGroup || (AssociatedGroup = {}));
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    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.coerce.number().int().positive().optional().alias('i'),
+    name: z.string().optional(),
+    associatedGroup: zod.coercedEnum(AssociatedGroup).optional()
+});
 class SpoGroupGetCommand extends SpoCommand {
     get name() {
         return commands.GROUP_GET;
@@ -16,13 +30,18 @@ class SpoGroupGetCommand extends SpoCommand {
     get description() {
         return 'Gets site group';
     }
-    constructor() {
-        super();
-        _SpoGroupGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoGroupGetCommand_instances, "m", _SpoGroupGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoGroupGetCommand_instances, "m", _SpoGroupGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoGroupGetCommand_instances, "m", _SpoGroupGetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoGroupGetCommand_instances, "m", _SpoGroupGetCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(o => [o.id, o.name, o.associatedGroup].filter(x => x !== undefined).length === 1, {
+            error: `Specify either 'id', 'name', or 'associatedGroup', but not multiple.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'name', 'associatedGroup']
+            }
+        });
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -65,37 +84,5 @@ class SpoGroupGetCommand extends SpoCommand {
         }
     }
 }
-_SpoGroupGetCommand_instances = new WeakSet(), _SpoGroupGetCommand_initTelemetry = function _SpoGroupGetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            id: (!(!args.options.id)).toString(),
-            name: (!(!args.options.name)).toString(),
-            associatedGroup: args.options.associatedGroup
-        });
-    });
-}, _SpoGroupGetCommand_initOptions = function _SpoGroupGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '-i, --id [id]'
-    }, {
-        option: '--name [name]'
-    }, {
-        option: '--associatedGroup [associatedGroup]',
-        autocomplete: ['Owner', 'Member', 'Visitor']
-    });
-}, _SpoGroupGetCommand_initValidators = function _SpoGroupGetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.id && isNaN(args.options.id)) {
-            return `Specified id ${args.options.id} is not a number`;
-        }
-        if (args.options.associatedGroup && ['owner', 'member', 'visitor'].indexOf(args.options.associatedGroup.toLowerCase()) === -1) {
-            return `${args.options.associatedGroup} is not a valid associatedGroup value. Allowed values are Owner|Member|Visitor.`;
-        }
-        return validation.isValidSharePointUrl(args.options.webUrl);
-    });
-}, _SpoGroupGetCommand_initOptionSets = function _SpoGroupGetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'name', 'associatedGroup'] });
-};
 export default new SpoGroupGetCommand();
 //# sourceMappingURL=group-get.js.map

package/dist/m365/spo/commands/group/group-list.js

@@ -1,15 +1,20 @@
-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 _SpoGroupListCommand_instances, _SpoGroupListCommand_initTelemetry, _SpoGroupListCommand_initOptions, _SpoGroupListCommand_initValidators;
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { odata } from '../../../../utils/odata.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()
+        .refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `'${e.input}' is not a valid SharePoint Online site URL.`
+    })
+        .alias('u'),
+    associatedGroupsOnly: z.boolean().optional()
+});
 class SpoGroupListCommand extends SpoCommand {
     get name() {
         return commands.GROUP_LIST;
@@ -20,12 +25,8 @@ class SpoGroupListCommand extends SpoCommand {
     defaultProperties() {
         return ['Id', 'Title', 'LoginName', 'IsHiddenInUI', 'PrincipalType', 'Type'];
     }
-    constructor() {
-        super();
-        _SpoGroupListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoGroupListCommand_instances, "m", _SpoGroupListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoGroupListCommand_instances, "m", _SpoGroupListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoGroupListCommand_instances, "m", _SpoGroupListCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -67,20 +68,5 @@ class SpoGroupListCommand extends SpoCommand {
         }
     }
 }
-_SpoGroupListCommand_instances = new WeakSet(), _SpoGroupListCommand_initTelemetry = function _SpoGroupListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            associatedGroupsOnly: (!(!args.options.associatedGroupsOnly)).toString()
-        });
-    });
-}, _SpoGroupListCommand_initOptions = function _SpoGroupListCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '--associatedGroupsOnly'
-    });
-}, _SpoGroupListCommand_initValidators = function _SpoGroupListCommand_initValidators() {
-    this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.webUrl));
-};
 export default new SpoGroupListCommand();
 //# sourceMappingURL=group-list.js.map

package/dist/m365/spo/commands/group/group-member-add.js

@@ -1,15 +1,42 @@
-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 _SpoGroupMemberAddCommand_instances, _SpoGroupMemberAddCommand_initTelemetry, _SpoGroupMemberAddCommand_initOptions, _SpoGroupMemberAddCommand_initValidators, _SpoGroupMemberAddCommand_initOptionSets, _SpoGroupMemberAddCommand_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';
 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()
+        .refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `'${e.input}' is not a valid SharePoint Online site URL.`
+    })
+        .alias('u'),
+    groupId: z.coerce.number().int().positive().optional(),
+    groupName: z.string().optional(),
+    userNames: z.string()
+        .refine(names => validation.isValidUserPrincipalNameArray(names) === true, {
+        error: e => `Option 'userNames' contains one or more invalid UPNs: ${validation.isValidUserPrincipalNameArray(e.input)}.`
+    })
+        .optional(),
+    emails: z.string()
+        .refine(emails => validation.isValidUserPrincipalNameArray(emails) === true, {
+        error: e => `Option 'emails' contains one or more invalid UPNs: ${validation.isValidUserPrincipalNameArray(e.input)}.`
+    })
+        .optional(),
+    userIds: z.string()
+        .refine(ids => validation.isValidPositiveIntegerArray(ids) === true, {
+        error: e => `Option 'userIds' contains one or more invalid numbers: ${validation.isValidPositiveIntegerArray(e.input)}.`
+    })
+        .optional(),
+    entraGroupIds: z.string()
+        .refine(ids => validation.isValidGuidArray(ids) === true, {
+        error: e => `Option 'entraGroupIds' contains one or more invalid GUIDs: ${validation.isValidGuidArray(e.input)}.`
+    })
+        .optional(),
+    entraGroupNames: z.string().optional()
+});
 class SpoGroupMemberAddCommand extends SpoCommand {
     get name() {
         return commands.GROUP_MEMBER_ADD;
@@ -17,14 +44,25 @@ class SpoGroupMemberAddCommand extends SpoCommand {
     get description() {
         return 'Adds members to a SharePoint Group';
     }
-    constructor() {
-        super();
-        _SpoGroupMemberAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoGroupMemberAddCommand_instances, "m", _SpoGroupMemberAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoGroupMemberAddCommand_instances, "m", _SpoGroupMemberAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoGroupMemberAddCommand_instances, "m", _SpoGroupMemberAddCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoGroupMemberAddCommand_instances, "m", _SpoGroupMemberAddCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _SpoGroupMemberAddCommand_instances, "m", _SpoGroupMemberAddCommand_initTypes).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(o => [o.groupId, o.groupName].filter(x => x !== undefined).length === 1, {
+            error: `Specify either 'groupId' or 'groupName', but not both.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['groupId', 'groupName']
+            }
+        })
+            .refine(o => [o.userNames, o.emails, o.userIds, o.entraGroupIds, o.entraGroupNames].filter(x => x !== undefined).length === 1, {
+            error: `Specify either 'userNames', 'emails', 'userIds', 'entraGroupIds', or 'entraGroupNames', but not multiple.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['userNames', 'emails', 'userIds', 'entraGroupIds', 'entraGroupNames']
+            }
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -112,75 +150,5 @@ class SpoGroupMemberAddCommand extends SpoCommand {
         return user.LoginName;
     }
 }
-_SpoGroupMemberAddCommand_instances = new WeakSet(), _SpoGroupMemberAddCommand_initTelemetry = function _SpoGroupMemberAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            groupId: typeof args.options.groupId !== 'undefined',
-            groupName: typeof args.options.groupName !== 'undefined',
-            userNames: typeof args.options.userNames !== 'undefined',
-            emails: typeof args.options.emails !== 'undefined',
-            userIds: typeof args.options.userIds !== 'undefined',
-            entraGroupIds: typeof args.options.entraGroupIds !== 'undefined',
-            entraGroupNames: typeof args.options.entraGroupNames !== 'undefined'
-        });
-    });
-}, _SpoGroupMemberAddCommand_initOptions = function _SpoGroupMemberAddCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '--groupId [groupId]'
-    }, {
-        option: '--groupName [groupName]'
-    }, {
-        option: '--userNames [userNames]'
-    }, {
-        option: '--emails [emails]'
-    }, {
-        option: '--userIds [userIds]'
-    }, {
-        option: '--entraGroupIds [entraGroupIds]'
-    }, {
-        option: '--entraGroupNames [entraGroupNames]'
-    });
-}, _SpoGroupMemberAddCommand_initValidators = function _SpoGroupMemberAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
-        if (isValidSharePointUrl !== true) {
-            return isValidSharePointUrl;
-        }
-        if (args.options.groupId && !validation.isValidPositiveInteger(args.options.groupId)) {
-            return `Specified groupId ${args.options.groupId} is not a positive number.`;
-        }
-        if (args.options.userIds) {
-            const isValidArray = validation.isValidPositiveIntegerArray(args.options.userIds);
-            if (isValidArray !== true) {
-                return `Option 'userIds' contains one or more invalid numbers: ${isValidArray}.`;
-            }
-        }
-        if (args.options.userNames) {
-            const isValidArray = validation.isValidUserPrincipalNameArray(args.options.userNames);
-            if (isValidArray !== true) {
-                return `Option 'userNames' contains one or more invalid UPNs: ${isValidArray}.`;
-            }
-        }
-        if (args.options.emails) {
-            const isValidArray = validation.isValidUserPrincipalNameArray(args.options.emails);
-            if (isValidArray !== true) {
-                return `Option 'emails' contains one or more invalid UPNs: ${isValidArray}.`;
-            }
-        }
-        if (args.options.entraGroupIds) {
-            const isValidArray = validation.isValidGuidArray(args.options.entraGroupIds);
-            if (isValidArray !== true) {
-                return `Option 'entraGroupIds' contains one or more invalid GUIDs: ${isValidArray}.`;
-            }
-        }
-        return true;
-    });
-}, _SpoGroupMemberAddCommand_initOptionSets = function _SpoGroupMemberAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['groupId', 'groupName'] }, { options: ['userNames', 'emails', 'userIds', 'entraGroupIds', 'entraGroupNames'] });
-}, _SpoGroupMemberAddCommand_initTypes = function _SpoGroupMemberAddCommand_initTypes() {
-    this.types.string.push('webUrl', 'groupName', 'userNames', 'emails', 'userIds', 'entraGroupIds', 'entraGroupNames');
-};
 export default new SpoGroupMemberAddCommand();
 //# sourceMappingURL=group-member-add.js.map

package/dist/m365/spo/commands/group/group-member-list.js

@@ -1,14 +1,20 @@
-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 _SpoGroupMemberListCommand_instances, _SpoGroupMemberListCommand_initTelemetry, _SpoGroupMemberListCommand_initOptions, _SpoGroupMemberListCommand_initValidators, _SpoGroupMemberListCommand_initOptionSets;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.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()
+        .refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `'${e.input}' is not a valid SharePoint Online site URL.`
+    })
+        .alias('u'),
+    groupId: z.coerce.number().int().positive().optional(),
+    groupName: z.string().optional()
+});
 class SpoGroupMemberListCommand extends SpoCommand {
     get name() {
         return commands.GROUP_MEMBER_LIST;
@@ -19,13 +25,18 @@ class SpoGroupMemberListCommand extends SpoCommand {
     defaultProperties() {
         return ['Title', 'UserPrincipalName', 'Id', 'Email'];
     }
-    constructor() {
-        super();
-        _SpoGroupMemberListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoGroupMemberListCommand_instances, "m", _SpoGroupMemberListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoGroupMemberListCommand_instances, "m", _SpoGroupMemberListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoGroupMemberListCommand_instances, "m", _SpoGroupMemberListCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoGroupMemberListCommand_instances, "m", _SpoGroupMemberListCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(o => [o.groupId, o.groupName].filter(x => x !== undefined).length === 1, {
+            error: `Specify either 'groupId' or 'groupName', but not both.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['groupId', 'groupName']
+            }
+        });
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -43,30 +54,5 @@ class SpoGroupMemberListCommand extends SpoCommand {
         }
     }
 }
-_SpoGroupMemberListCommand_instances = new WeakSet(), _SpoGroupMemberListCommand_initTelemetry = function _SpoGroupMemberListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            groupId: typeof args.options.groupId !== 'undefined',
-            groupName: typeof args.options.groupName !== 'undefined'
-        });
-    });
-}, _SpoGroupMemberListCommand_initOptions = function _SpoGroupMemberListCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '--groupId [groupId]'
-    }, {
-        option: '--groupName [groupName]'
-    });
-}, _SpoGroupMemberListCommand_initValidators = function _SpoGroupMemberListCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.groupId && isNaN(args.options.groupId)) {
-            return `Specified "groupId" ${args.options.groupId} is not valid`;
-        }
-        return validation.isValidSharePointUrl(args.options.webUrl);
-    });
-}, _SpoGroupMemberListCommand_initOptionSets = function _SpoGroupMemberListCommand_initOptionSets() {
-    this.optionSets.push({ options: ['groupName', 'groupId'] });
-};
 export default new SpoGroupMemberListCommand();
 //# sourceMappingURL=group-member-list.js.map

package/dist/m365/spo/commands/group/group-member-remove.js

@@ -1,10 +1,6 @@
-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 _SpoGroupMemberRemoveCommand_instances, _SpoGroupMemberRemoveCommand_initTelemetry, _SpoGroupMemberRemoveCommand_initOptions, _SpoGroupMemberRemoveCommand_initValidators, _SpoGroupMemberRemoveCommand_initOptionSets;
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
@@ -12,6 +8,34 @@ import entraUserGetCommand from '../../../entra/commands/user/user-get.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
 import SpoGroupMemberListCommand from './group-member-list.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    webUrl: z.string()
+        .refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `'${e.input}' is not a valid SharePoint Online site URL.`
+    })
+        .alias('u'),
+    groupId: z.coerce.number().int().positive().optional(),
+    groupName: z.string().optional(),
+    userName: z.string()
+        .refine(userName => validation.isValidUserPrincipalName(userName), {
+        error: e => `'${e.input}' is not a valid userName.`
+    })
+        .optional(),
+    email: z.string()
+        .refine(email => validation.isValidUserPrincipalName(email), {
+        error: e => `'${e.input}' is not a valid email.`
+    })
+        .optional(),
+    userId: z.number().optional(),
+    entraGroupId: z.string()
+        .refine(id => validation.isValidGuid(id), {
+        error: e => `'${e.input}' is not a valid GUID.`
+    })
+        .optional(),
+    entraGroupName: z.string().optional(),
+    force: z.boolean().optional().alias('f')
+});
 class SpoGroupMemberRemoveCommand extends SpoCommand {
     get name() {
         return commands.GROUP_MEMBER_REMOVE;
@@ -19,13 +43,25 @@ class SpoGroupMemberRemoveCommand extends SpoCommand {
     get description() {
         return 'Removes the specified member from a SharePoint group';
     }
-    constructor() {
-        super();
-        _SpoGroupMemberRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoGroupMemberRemoveCommand_instances, "m", _SpoGroupMemberRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoGroupMemberRemoveCommand_instances, "m", _SpoGroupMemberRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoGroupMemberRemoveCommand_instances, "m", _SpoGroupMemberRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoGroupMemberRemoveCommand_instances, "m", _SpoGroupMemberRemoveCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(o => [o.groupId, o.groupName].filter(x => x !== undefined).length === 1, {
+            error: `Specify either 'groupId' or 'groupName', but not both.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['groupId', 'groupName']
+            }
+        })
+            .refine(o => [o.userName, o.email, o.userId, o.entraGroupId, o.entraGroupName].filter(x => x !== undefined).length === 1, {
+            error: `Specify either 'userName', 'email', 'userId', 'entraGroupId', or 'entraGroupName', but not multiple.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['userName', 'email', 'userId', 'entraGroupId', 'entraGroupName']
+            }
+        });
     }
     async getUserName(logger, args) {
         if (args.options.userName) {
@@ -119,60 +155,5 @@ class SpoGroupMemberRemoveCommand extends SpoCommand {
         return foundGroups[0].Id;
     }
 }
-_SpoGroupMemberRemoveCommand_instances = new WeakSet(), _SpoGroupMemberRemoveCommand_initTelemetry = function _SpoGroupMemberRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            groupId: (!(!args.options.groupId)).toString(),
-            groupName: (!(!args.options.groupName)).toString(),
-            userName: (!(!args.options.userName)).toString(),
-            email: (!(!args.options.email)).toString(),
-            userId: (!(!args.options.userId)).toString(),
-            entraGroupId: (!(!args.options.entraGroupId)).toString(),
-            entraGroupName: (!(!args.options.entraGroupName)).toString(),
-            force: (!(!args.options.force)).toString()
-        });
-    });
-}, _SpoGroupMemberRemoveCommand_initOptions = function _SpoGroupMemberRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '--groupId [groupId]'
-    }, {
-        option: '--groupName [groupName]'
-    }, {
-        option: '--userName [userName]'
-    }, {
-        option: '--email [email]'
-    }, {
-        option: '--userId [userId]'
-    }, {
-        option: '--entraGroupId [entraGroupId]'
-    }, {
-        option: '--entraGroupName [entraGroupName]'
-    }, {
-        option: '-f, --force'
-    });
-}, _SpoGroupMemberRemoveCommand_initValidators = function _SpoGroupMemberRemoveCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.groupId && isNaN(args.options.groupId)) {
-            return `Specified "groupId" ${args.options.groupId} is not valid`;
-        }
-        if (args.options.userId && isNaN(args.options.userId)) {
-            return `Specified "userId" ${args.options.userId} is not valid`;
-        }
-        if (args.options.userName && !validation.isValidUserPrincipalName(args.options.userName)) {
-            return `${args.options.userName} is not a valid userName`;
-        }
-        if (args.options.email && !validation.isValidUserPrincipalName(args.options.email)) {
-            return `${args.options.email} is not a valid email`;
-        }
-        if (args.options.entraGroupId && !validation.isValidGuid(args.options.entraGroupId)) {
-            return `${args.options.entraGroupId} is not a valid GUID`;
-        }
-        return validation.isValidSharePointUrl(args.options.webUrl);
-    });
-}, _SpoGroupMemberRemoveCommand_initOptionSets = function _SpoGroupMemberRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['groupName', 'groupId'] }, { options: ['userName', 'email', 'userId', 'entraGroupId', 'entraGroupName'] });
-};
 export default new SpoGroupMemberRemoveCommand();
 //# sourceMappingURL=group-member-remove.js.map

package/dist/m365/spo/commands/group/group-remove.js

@@ -1,14 +1,21 @@
-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 _SpoGroupRemoveCommand_instances, _SpoGroupRemoveCommand_initTelemetry, _SpoGroupRemoveCommand_initOptions, _SpoGroupRemoveCommand_initValidators, _SpoGroupRemoveCommand_initOptionSets;
+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 SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    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.number().optional(),
+    name: z.string().optional(),
+    force: z.boolean().optional().alias('f')
+});
 class SpoGroupRemoveCommand extends SpoCommand {
     get name() {
         return commands.GROUP_REMOVE;
@@ -16,13 +23,18 @@ class SpoGroupRemoveCommand extends SpoCommand {
     get description() {
         return 'Removes group from specific web';
     }
-    constructor() {
-        super();
-        _SpoGroupRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoGroupRemoveCommand_instances, "m", _SpoGroupRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoGroupRemoveCommand_instances, "m", _SpoGroupRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoGroupRemoveCommand_instances, "m", _SpoGroupRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoGroupRemoveCommand_instances, "m", _SpoGroupRemoveCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(o => [o.id, o.name].filter(x => x !== undefined).length === 1, {
+            error: `Specify either 'id' or 'name', but not both.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'name']
+            }
+        });
     }
     async commandAction(logger, args) {
         const removeGroup = async () => {
@@ -73,37 +85,5 @@ class SpoGroupRemoveCommand extends SpoCommand {
         }
     }
 }
-_SpoGroupRemoveCommand_instances = new WeakSet(), _SpoGroupRemoveCommand_initTelemetry = function _SpoGroupRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            id: (!(!args.options.id)).toString(),
-            name: (!(!args.options.name)).toString(),
-            force: (!(!args.options.force)).toString()
-        });
-    });
-}, _SpoGroupRemoveCommand_initOptions = function _SpoGroupRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '--id [id]'
-    }, {
-        option: '--name [name]'
-    }, {
-        option: '-f, --force'
-    });
-}, _SpoGroupRemoveCommand_initValidators = function _SpoGroupRemoveCommand_initValidators() {
-    this.validators.push(async (args) => {
-        const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
-        if (isValidSharePointUrl !== true) {
-            return isValidSharePointUrl;
-        }
-        if (args.options.id && typeof args.options.id !== 'number') {
-            return `${args.options.id} is not a number`;
-        }
-        return true;
-    });
-}, _SpoGroupRemoveCommand_initOptionSets = function _SpoGroupRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'name'] });
-};
 export default new SpoGroupRemoveCommand();
 //# sourceMappingURL=group-remove.js.map