@pnp/cli-microsoft365 11.9.0-beta.f8dc984 → 11.10.0-beta.3e566b1

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

@@ -1,15 +1,16 @@
-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 _EntraGroupRemoveCommand_instances, _EntraGroupRemoveCommand_initTelemetry, _EntraGroupRemoveCommand_initOptions, _EntraGroupRemoveCommand_initOptionSets, _EntraGroupRemoveCommand_initValidators, _EntraGroupRemoveCommand_initTypes;
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.js';
-import GraphCommand from '../../../base/GraphCommand.js';
-import commands from '../../commands.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { entraGroup } from '../../../../utils/entraGroup.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.uuid().optional().alias('i'),
+    displayName: z.string().optional().alias('n'),
+    force: z.boolean().optional().alias('f')
+});
 class EntraGroupRemoveCommand extends GraphCommand {
     get name() {
         return commands.GROUP_REMOVE;
@@ -17,14 +18,18 @@ class EntraGroupRemoveCommand extends GraphCommand {
     get description() {
         return 'Removes an Entra group';
     }
-    constructor() {
-        super();
-        _EntraGroupRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraGroupRemoveCommand_instances, "m", _EntraGroupRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraGroupRemoveCommand_instances, "m", _EntraGroupRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraGroupRemoveCommand_instances, "m", _EntraGroupRemoveCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _EntraGroupRemoveCommand_instances, "m", _EntraGroupRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraGroupRemoveCommand_instances, "m", _EntraGroupRemoveCommand_initTypes).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => [options.id, options.displayName].filter(o => o !== undefined).length === 1, {
+            error: 'Use one of the following options: id or displayName.',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'displayName']
+            }
+        });
     }
     async commandAction(logger, args) {
         const removeGroup = async () => {
@@ -59,35 +64,5 @@ class EntraGroupRemoveCommand extends GraphCommand {
         }
     }
 }
-_EntraGroupRemoveCommand_instances = new WeakSet(), _EntraGroupRemoveCommand_initTelemetry = function _EntraGroupRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            id: args.options.id !== 'undefined',
-            displayName: args.options.displayName !== 'undefined',
-            force: !!args.options.force
-        });
-    });
-}, _EntraGroupRemoveCommand_initOptions = function _EntraGroupRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id [id]'
-    }, {
-        option: '-n, --displayName [displayName]'
-    }, {
-        option: '-f, --force'
-    });
-}, _EntraGroupRemoveCommand_initOptionSets = function _EntraGroupRemoveCommand_initOptionSets() {
-    this.optionSets.push({
-        options: ['id', 'displayName']
-    });
-}, _EntraGroupRemoveCommand_initValidators = function _EntraGroupRemoveCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.id && !validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID for option id.`;
-        }
-        return true;
-    });
-}, _EntraGroupRemoveCommand_initTypes = function _EntraGroupRemoveCommand_initTypes() {
-    this.types.string.push('id', 'displayName');
-};
 export default new EntraGroupRemoveCommand();
 //# sourceMappingURL=group-remove.js.map

package/dist/m365/entra/commands/group/group-set.js

@@ -1,17 +1,50 @@
-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 _EntraGroupSetCommand_instances, _EntraGroupSetCommand_initTelemetry, _EntraGroupSetCommand_initOptions, _EntraGroupSetCommand_initValidators, _EntraGroupSetCommand_initOptionSets, _EntraGroupSetCommand_initTypes;
-import GraphCommand from '../../../base/GraphCommand.js';
-import commands from '../../commands.js';
-import { validation } from '../../../../utils/validation.js';
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
-import { entraUser } from '../../../../utils/entraUser.js';
 import { entraGroup } from '../../../../utils/entraGroup.js';
+import { entraUser } from '../../../../utils/entraUser.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
+import { validation } from '../../../../utils/validation.js';
+import { zod } from '../../../../utils/zod.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+const VisibilityEnum = {
+    Public: 'Public',
+    Private: 'Private'
+};
+export const options = z.looseObject({
+    ...globalOptionsZod.shape,
+    id: z.uuid().optional().alias('i'),
+    displayName: z.string().optional().alias('n'),
+    newDisplayName: z.string().max(256, `The maximum amount of characters for 'newDisplayName' is 256.`).optional(),
+    description: z.string().optional(),
+    mailNickname: z.string()
+        .refine(val => validation.isValidMailNickname(val), {
+        error: e => `Value '${e.input}' for option 'mailNickname' must contain only characters in the ASCII character set 0-127 except the following: @ () \\ [] " ; : <> , SPACE.`
+    })
+        .refine(val => val.length <= 64, {
+        error: `The maximum amount of characters for 'mailNickname' is 64.`
+    })
+        .optional(),
+    ownerIds: z.string()
+        .refine(ids => validation.isValidGuidArray(ids) === true, {
+        error: e => `The following GUIDs are invalid for option 'ownerIds': ${validation.isValidGuidArray(e.input)}.`
+    }).optional(),
+    ownerUserNames: z.string()
+        .refine(names => validation.isValidUserPrincipalNameArray(names) === true, {
+        error: e => `The following user principal names are invalid for option 'ownerUserNames': ${validation.isValidUserPrincipalNameArray(e.input)}.`
+    }).optional(),
+    memberIds: z.string()
+        .refine(ids => validation.isValidGuidArray(ids) === true, {
+        error: e => `The following GUIDs are invalid for option 'memberIds': ${validation.isValidGuidArray(e.input)}.`
+    }).optional(),
+    memberUserNames: z.string()
+        .refine(names => validation.isValidUserPrincipalNameArray(names) === true, {
+        error: e => `The following user principal names are invalid for option 'memberUserNames': ${validation.isValidUserPrincipalNameArray(e.input)}.`
+    }).optional(),
+    visibility: zod.coercedEnum(VisibilityEnum).optional()
+});
 class EntraGroupSetCommand extends GraphCommand {
     get name() {
         return commands.GROUP_SET;
@@ -22,15 +55,37 @@ class EntraGroupSetCommand extends GraphCommand {
     allowUnknownOptions() {
         return true;
     }
-    constructor() {
-        super();
-        _EntraGroupSetCommand_instances.add(this);
-        this.allowedVisibility = ['Public', 'Private'];
-        __classPrivateFieldGet(this, _EntraGroupSetCommand_instances, "m", _EntraGroupSetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraGroupSetCommand_instances, "m", _EntraGroupSetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraGroupSetCommand_instances, "m", _EntraGroupSetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraGroupSetCommand_instances, "m", _EntraGroupSetCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _EntraGroupSetCommand_instances, "m", _EntraGroupSetCommand_initTypes).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => [options.id, options.displayName].filter(o => o !== undefined).length === 1, {
+            error: 'Use one of the following options: id or displayName.',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'displayName']
+            }
+        })
+            .refine(options => !(options.ownerIds && options.ownerUserNames), {
+            error: 'Use one of the following options: ownerIds or ownerUserNames.',
+            params: {
+                customCode: 'optionSet',
+                options: ['ownerIds', 'ownerUserNames']
+            }
+        })
+            .refine(options => !(options.memberIds && options.memberUserNames), {
+            error: 'Use one of the following options: memberIds or memberUserNames.',
+            params: {
+                customCode: 'optionSet',
+                options: ['memberIds', 'memberUserNames']
+            }
+        })
+            .refine(options => options.newDisplayName !== undefined || options.description !== undefined || options.visibility !== undefined
+            || options.ownerIds !== undefined || options.ownerUserNames !== undefined || options.memberIds !== undefined
+            || options.memberUserNames !== undefined || options.mailNickname !== undefined, {
+            error: `Specify at least one of the following options: 'newDisplayName', 'description', 'visibility', 'ownerIds', 'ownerUserNames', 'memberIds', 'memberUserNames', 'mailNickname'.`
+        });
     }
     async commandAction(logger, args) {
         let groupId = args.options.id;
@@ -47,7 +102,7 @@ class EntraGroupSetCommand extends GraphCommand {
                 mailNickName: args.options.mailNickname,
                 visibility: args.options.visibility
             };
-            this.addUnknownOptionsToPayload(requestBody, args.options);
+            this.addUnknownOptionsToPayloadZod(requestBody, args.options);
             const requestOptions = {
                 url: `${this.resource}/v1.0/groups/${groupId}`,
                 headers: {
@@ -158,105 +213,5 @@ class EntraGroupSetCommand extends GraphCommand {
         return requestOptions;
     }
 }
-_EntraGroupSetCommand_instances = new WeakSet(), _EntraGroupSetCommand_initTelemetry = function _EntraGroupSetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            id: typeof args.options.id !== 'undefined',
-            displayName: typeof args.options.displayName !== 'undefined',
-            newDisplayName: typeof args.options.newDisplayName !== 'undefined',
-            description: typeof args.options.description !== 'undefined',
-            mailNickname: typeof args.options.mailNickname !== 'undefined',
-            ownerIds: typeof args.options.ownerIds !== 'undefined',
-            ownerUserNames: typeof args.options.ownerUserNames !== 'undefined',
-            memberIds: typeof args.options.memberIds !== 'undefined',
-            memberUserNames: typeof args.options.memberUserNames !== 'undefined',
-            visibility: typeof args.options.visibility !== 'undefined'
-        });
-        this.trackUnknownOptions(this.telemetryProperties, args.options);
-    });
-}, _EntraGroupSetCommand_initOptions = function _EntraGroupSetCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id [id]'
-    }, {
-        option: '--mailNickname [mailNickname]'
-    }, {
-        option: '-n, --displayName [displayName]'
-    }, {
-        option: '--newDisplayName [newDisplayName]'
-    }, {
-        option: '--description [description]'
-    }, {
-        option: '--ownerIds [ownerIds]'
-    }, {
-        option: '--ownerUserNames [ownerUserNames]'
-    }, {
-        option: '--memberIds [memberIds]'
-    }, {
-        option: '--memberUserNames [memberUserNames]'
-    }, {
-        option: '--visibility [visibility]',
-        autocomplete: this.allowedVisibility
-    });
-}, _EntraGroupSetCommand_initValidators = function _EntraGroupSetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.id && !validation.isValidGuid(args.options.id)) {
-            return `Value '${args.options.id}' is not a valid GUID for option 'id'.`;
-        }
-        if (args.options.newDisplayName && args.options.newDisplayName.length > 256) {
-            return `The maximum amount of characters for 'newDisplayName' is 256.`;
-        }
-        if (args.options.mailNickname) {
-            if (!validation.isValidMailNickname(args.options.mailNickname)) {
-                return `Value '${args.options.mailNickname}' for option 'mailNickname' must contain only characters in the ASCII character set 0-127 except the following: @ () \\ [] " ; : <> , SPACE.`;
-            }
-            if (args.options.mailNickname.length > 64) {
-                return `The maximum amount of characters for 'mailNickname' is 64.`;
-            }
-        }
-        if (args.options.ownerIds) {
-            const isValidGUIDArrayResult = validation.isValidGuidArray(args.options.ownerIds);
-            if (isValidGUIDArrayResult !== true) {
-                return `The following GUIDs are invalid for option 'ownerIds': ${isValidGUIDArrayResult}.`;
-            }
-        }
-        if (args.options.ownerUserNames) {
-            const isValidUPNArrayResult = validation.isValidUserPrincipalNameArray(args.options.ownerUserNames);
-            if (isValidUPNArrayResult !== true) {
-                return `The following user principal names are invalid for option 'ownerUserNames': ${isValidUPNArrayResult}.`;
-            }
-        }
-        if (args.options.memberIds) {
-            const isValidGUIDArrayResult = validation.isValidGuidArray(args.options.memberIds);
-            if (isValidGUIDArrayResult !== true) {
-                return `The following GUIDs are invalid for option 'memberIds': ${isValidGUIDArrayResult}.`;
-            }
-        }
-        if (args.options.memberUserNames) {
-            const isValidUPNArrayResult = validation.isValidUserPrincipalNameArray(args.options.memberUserNames);
-            if (isValidUPNArrayResult !== true) {
-                return `The following user principal names are invalid for option 'memberUserNames': ${isValidUPNArrayResult}.`;
-            }
-        }
-        if (args.options.visibility && !this.allowedVisibility.includes(args.options.visibility)) {
-            return `Option 'visibility' must be one of the following values: ${this.allowedVisibility.join(', ')}.`;
-        }
-        if (args.options.newDisplayName === undefined && args.options.description === undefined && args.options.visibility === undefined
-            && args.options.ownerIds === undefined && args.options.ownerUserNames === undefined && args.options.memberIds === undefined
-            && args.options.memberUserNames === undefined && args.options.mailNickname === undefined) {
-            return `Specify at least one of the following options: 'newDisplayName', 'description', 'visibility', 'ownerIds', 'ownerUserNames', 'memberIds', 'memberUserNames', 'mailNickname'.`;
-        }
-        return true;
-    });
-}, _EntraGroupSetCommand_initOptionSets = function _EntraGroupSetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'displayName'] }, {
-        options: ['ownerIds', 'ownerUserNames'],
-        runsWhen: (args) => args.options.ownerIds || args.options.ownerUserNames
-    }, {
-        options: ['memberIds', 'memberUserNames'],
-        runsWhen: (args) => args.options.memberIds || args.options.memberUserNames
-    });
-}, _EntraGroupSetCommand_initTypes = function _EntraGroupSetCommand_initTypes() {
-    this.types.string.push('id', 'displayName', 'newDisplayName', 'description', 'mailNickname', 'ownerIds', 'ownerUserNames', 'memberIds', 'memberUserNames', 'visibility');
-};
 export default new EntraGroupSetCommand();
 //# sourceMappingURL=group-set.js.map

package/dist/m365/entra/commands/groupsetting/groupsetting-add.js

@@ -1,13 +1,12 @@
-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 _EntraGroupSettingAddCommand_instances, _EntraGroupSettingAddCommand_initOptions, _EntraGroupSettingAddCommand_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.looseObject({
+    ...globalOptionsZod.shape,
+    templateId: z.uuid().alias('i')
+});
 class EntraGroupSettingAddCommand extends GraphCommand {
     get name() {
         return commands.GROUPSETTING_ADD;
@@ -15,15 +14,12 @@ class EntraGroupSettingAddCommand extends GraphCommand {
     get description() {
         return 'Creates a group setting';
     }
-    constructor() {
-        super();
-        _EntraGroupSettingAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraGroupSettingAddCommand_instances, "m", _EntraGroupSettingAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraGroupSettingAddCommand_instances, "m", _EntraGroupSettingAddCommand_initValidators).call(this);
-    }
     allowUnknownOptions() {
         return true;
     }
+    get schema() {
+        return options;
+    }
     async commandAction(logger, args) {
         if (this.verbose) {
             await logger.logToStderr(`Retrieving group setting template with id '${args.options.templateId}'...`);
@@ -83,17 +79,5 @@ class EntraGroupSettingAddCommand extends GraphCommand {
         return values;
     }
 }
-_EntraGroupSettingAddCommand_instances = new WeakSet(), _EntraGroupSettingAddCommand_initOptions = function _EntraGroupSettingAddCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --templateId <templateId>'
-    });
-}, _EntraGroupSettingAddCommand_initValidators = function _EntraGroupSettingAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (!validation.isValidGuid(args.options.templateId)) {
-            return `${args.options.templateId} is not a valid GUID`;
-        }
-        return true;
-    });
-};
 export default new EntraGroupSettingAddCommand();
 //# sourceMappingURL=groupsetting-add.js.map

package/dist/m365/entra/commands/groupsetting/groupsetting-get.js

@@ -1,13 +1,12 @@
-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 _EntraGroupSettingGetCommand_instances, _EntraGroupSettingGetCommand_initOptions, _EntraGroupSettingGetCommand_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.uuid().alias('i')
+});
 class EntraGroupSettingGetCommand extends GraphCommand {
     get name() {
         return commands.GROUPSETTING_GET;
@@ -15,11 +14,8 @@ class EntraGroupSettingGetCommand extends GraphCommand {
     get description() {
         return 'Gets information about the particular group setting';
     }
-    constructor() {
-        super();
-        _EntraGroupSettingGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraGroupSettingGetCommand_instances, "m", _EntraGroupSettingGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraGroupSettingGetCommand_instances, "m", _EntraGroupSettingGetCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         try {
@@ -38,17 +34,5 @@ class EntraGroupSettingGetCommand extends GraphCommand {
         }
     }
 }
-_EntraGroupSettingGetCommand_instances = new WeakSet(), _EntraGroupSettingGetCommand_initOptions = function _EntraGroupSettingGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id <id>'
-    });
-}, _EntraGroupSettingGetCommand_initValidators = function _EntraGroupSettingGetCommand_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 EntraGroupSettingGetCommand();
 //# sourceMappingURL=groupsetting-get.js.map

package/dist/m365/entra/commands/groupsetting/groupsetting-list.js

@@ -1,6 +1,9 @@
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({ ...globalOptionsZod.shape });
 class EntraGroupSettingListCommand extends GraphCommand {
     get name() {
         return commands.GROUPSETTING_LIST;
@@ -11,6 +14,9 @@ class EntraGroupSettingListCommand extends GraphCommand {
     defaultProperties() {
         return ['id', 'displayName'];
     }
+    get schema() {
+        return options;
+    }
     async commandAction(logger) {
         try {
             const groupSettings = await odata.getAllItems(`${this.resource}/v1.0/groupSettings`);

package/dist/m365/entra/commands/groupsetting/groupsetting-remove.js

@@ -1,14 +1,14 @@
-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 _EntraGroupSettingRemoveCommand_instances, _EntraGroupSettingRemoveCommand_initTelemetry, _EntraGroupSettingRemoveCommand_initOptions, _EntraGroupSettingRemoveCommand_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.uuid().alias('i'),
+    force: z.boolean().optional().alias('f')
+});
 class EntraGroupSettingRemoveCommand extends GraphCommand {
     get name() {
         return commands.GROUPSETTING_REMOVE;
@@ -16,12 +16,8 @@ class EntraGroupSettingRemoveCommand extends GraphCommand {
     get description() {
         return 'Removes the particular group setting';
     }
-    constructor() {
-        super();
-        _EntraGroupSettingRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraGroupSettingRemoveCommand_instances, "m", _EntraGroupSettingRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraGroupSettingRemoveCommand_instances, "m", _EntraGroupSettingRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraGroupSettingRemoveCommand_instances, "m", _EntraGroupSettingRemoveCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         const removeGroupSetting = async () => {
@@ -52,25 +48,5 @@ class EntraGroupSettingRemoveCommand extends GraphCommand {
         }
     }
 }
-_EntraGroupSettingRemoveCommand_instances = new WeakSet(), _EntraGroupSettingRemoveCommand_initTelemetry = function _EntraGroupSettingRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            force: (!(!args.options.force)).toString()
-        });
-    });
-}, _EntraGroupSettingRemoveCommand_initOptions = function _EntraGroupSettingRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id <id>'
-    }, {
-        option: '-f, --force'
-    });
-}, _EntraGroupSettingRemoveCommand_initValidators = function _EntraGroupSettingRemoveCommand_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 EntraGroupSettingRemoveCommand();
 //# sourceMappingURL=groupsetting-remove.js.map

package/dist/m365/entra/commands/groupsetting/groupsetting-set.js

@@ -1,13 +1,12 @@
-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 _EntraGroupSettingSetCommand_instances, _EntraGroupSettingSetCommand_initOptions, _EntraGroupSettingSetCommand_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.looseObject({
+    ...globalOptionsZod.shape,
+    id: z.uuid().alias('i')
+});
 class EntraGroupSettingSetCommand extends GraphCommand {
     get name() {
         return commands.GROUPSETTING_SET;
@@ -18,11 +17,8 @@ class EntraGroupSettingSetCommand extends GraphCommand {
     allowUnknownOptions() {
         return true;
     }
-    constructor() {
-        super();
-        _EntraGroupSettingSetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraGroupSettingSetCommand_instances, "m", _EntraGroupSettingSetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraGroupSettingSetCommand_instances, "m", _EntraGroupSettingSetCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -83,17 +79,5 @@ class EntraGroupSettingSetCommand extends GraphCommand {
         return values;
     }
 }
-_EntraGroupSettingSetCommand_instances = new WeakSet(), _EntraGroupSettingSetCommand_initOptions = function _EntraGroupSettingSetCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id <id>'
-    });
-}, _EntraGroupSettingSetCommand_initValidators = function _EntraGroupSettingSetCommand_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 EntraGroupSettingSetCommand();
 //# sourceMappingURL=groupsetting-set.js.map

package/dist/m365/entra/commands/groupsettingtemplate/groupsettingtemplate-get.js

@@ -1,13 +1,13 @@
-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 _EntraGroupSettingTemplateGetCommand_instances, _EntraGroupSettingTemplateGetCommand_initTelemetry, _EntraGroupSettingTemplateGetCommand_initOptions, _EntraGroupSettingTemplateGetCommand_initValidators, _EntraGroupSettingTemplateGetCommand_initOptionSets;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { odata } from '../../../../utils/odata.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.uuid().optional().alias('i'),
+    displayName: z.string().optional().alias('n')
+});
 class EntraGroupSettingTemplateGetCommand extends GraphCommand {
     get name() {
         return commands.GROUPSETTINGTEMPLATE_GET;
@@ -15,13 +15,18 @@ class EntraGroupSettingTemplateGetCommand extends GraphCommand {
     get description() {
         return 'Gets information about the specified Entra group settings template';
     }
-    constructor() {
-        super();
-        _EntraGroupSettingTemplateGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraGroupSettingTemplateGetCommand_instances, "m", _EntraGroupSettingTemplateGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraGroupSettingTemplateGetCommand_instances, "m", _EntraGroupSettingTemplateGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraGroupSettingTemplateGetCommand_instances, "m", _EntraGroupSettingTemplateGetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraGroupSettingTemplateGetCommand_instances, "m", _EntraGroupSettingTemplateGetCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => [options.id, options.displayName].filter(Boolean).length === 1, {
+            error: 'Specify either id or displayName',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'displayName']
+            }
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -39,29 +44,5 @@ class EntraGroupSettingTemplateGetCommand extends GraphCommand {
         }
     }
 }
-_EntraGroupSettingTemplateGetCommand_instances = new WeakSet(), _EntraGroupSettingTemplateGetCommand_initTelemetry = function _EntraGroupSettingTemplateGetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            id: typeof args.options.id !== 'undefined',
-            displayName: typeof args.options.displayName !== 'undefined'
-        });
-    });
-}, _EntraGroupSettingTemplateGetCommand_initOptions = function _EntraGroupSettingTemplateGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id [id]'
-    }, {
-        option: '-n, --displayName [displayName]'
-    });
-}, _EntraGroupSettingTemplateGetCommand_initValidators = function _EntraGroupSettingTemplateGetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.id &&
-            !validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
-        }
-        return true;
-    });
-}, _EntraGroupSettingTemplateGetCommand_initOptionSets = function _EntraGroupSettingTemplateGetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'displayName'] });
-};
 export default new EntraGroupSettingTemplateGetCommand();
 //# sourceMappingURL=groupsettingtemplate-get.js.map

package/dist/m365/entra/commands/groupsettingtemplate/groupsettingtemplate-list.js

@@ -1,6 +1,9 @@
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({ ...globalOptionsZod.shape });
 class EntraGroupSettingTemplateListCommand extends GraphCommand {
     get name() {
         return commands.GROUPSETTINGTEMPLATE_LIST;
@@ -11,6 +14,9 @@ class EntraGroupSettingTemplateListCommand extends GraphCommand {
     defaultProperties() {
         return ['id', 'displayName'];
     }
+    get schema() {
+        return options;
+    }
     async commandAction(logger) {
         try {
             const templates = await odata.getAllItems(`${this.resource}/v1.0/groupSettingTemplates`);