@pnp/cli-microsoft365 12.0.0-beta.4ac11a7 → 12.0.0-beta.8769a5e

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

@@ -1,14 +1,17 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _EntraM365GroupListCommand_instances, _EntraM365GroupListCommand_initTelemetry, _EntraM365GroupListCommand_initOptions;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.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,
+    displayName: z.string().optional().alias('d'),
+    mailNickname: z.string().optional().alias('m'),
+    withSiteUrl: z.boolean().optional(),
+    orphaned: z.boolean().optional()
+});
 class EntraM365GroupListCommand extends GraphCommand {
     get name() {
         return commands.M365GROUP_LIST;
@@ -16,11 +19,8 @@ class EntraM365GroupListCommand extends GraphCommand {
     get description() {
         return 'Lists Microsoft 365 Groups in the current tenant';
     }
-    constructor() {
-        super();
-        _EntraM365GroupListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraM365GroupListCommand_instances, "m", _EntraM365GroupListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupListCommand_instances, "m", _EntraM365GroupListCommand_initOptions).call(this);
+    get schema() {
+        return options;
     }
     defaultProperties() {
         return ['id', 'displayName', 'mailNickname', 'siteUrl'];
@@ -76,25 +76,5 @@ class EntraM365GroupListCommand extends GraphCommand {
         };
     }
 }
-_EntraM365GroupListCommand_instances = new WeakSet(), _EntraM365GroupListCommand_initTelemetry = function _EntraM365GroupListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            displayName: typeof args.options.displayName !== 'undefined',
-            mailNickname: typeof args.options.mailNickname !== 'undefined',
-            withSiteUrl: !!args.options.withSiteUrl,
-            orphaned: !!args.options.orphaned
-        });
-    });
-}, _EntraM365GroupListCommand_initOptions = function _EntraM365GroupListCommand_initOptions() {
-    this.options.unshift({
-        option: '-d, --displayName [displayName]'
-    }, {
-        option: '-m, --mailNickname [displayName]'
-    }, {
-        option: '--withSiteUrl'
-    }, {
-        option: '--orphaned'
-    });
-};
 export default new EntraM365GroupListCommand();
 //# sourceMappingURL=m365group-list.js.map

package/dist/m365/entra/commands/m365group/m365group-recyclebinitem-clear.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 _EntraM365GroupRecycleBinItemClearCommand_instances, _EntraM365GroupRecycleBinItemClearCommand_initTelemetry, _EntraM365GroupRecycleBinItemClearCommand_initOptions;
+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 GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    force: z.boolean().optional().alias('f')
+});
 class EntraM365GroupRecycleBinItemClearCommand extends GraphCommand {
     get name() {
         return commands.M365GROUP_RECYCLEBINITEM_CLEAR;
@@ -16,11 +16,8 @@ class EntraM365GroupRecycleBinItemClearCommand extends GraphCommand {
     get description() {
         return 'Clears all M365 Groups from recycle bin.';
     }
-    constructor() {
-        super();
-        _EntraM365GroupRecycleBinItemClearCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraM365GroupRecycleBinItemClearCommand_instances, "m", _EntraM365GroupRecycleBinItemClearCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupRecycleBinItemClearCommand_instances, "m", _EntraM365GroupRecycleBinItemClearCommand_initOptions).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         const clearM365GroupRecycleBinItems = async () => {
@@ -62,16 +59,5 @@ class EntraM365GroupRecycleBinItemClearCommand extends GraphCommand {
         await Promise.all(deletePromises);
     }
 }
-_EntraM365GroupRecycleBinItemClearCommand_instances = new WeakSet(), _EntraM365GroupRecycleBinItemClearCommand_initTelemetry = function _EntraM365GroupRecycleBinItemClearCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            force: typeof args.options.force !== 'undefined'
-        });
-    });
-}, _EntraM365GroupRecycleBinItemClearCommand_initOptions = function _EntraM365GroupRecycleBinItemClearCommand_initOptions() {
-    this.options.unshift({
-        option: '-f, --force'
-    });
-};
 export default new EntraM365GroupRecycleBinItemClearCommand();
 //# sourceMappingURL=m365group-recyclebinitem-clear.js.map

package/dist/m365/entra/commands/m365group/m365group-recyclebinitem-list.js

@@ -1,13 +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 _EntraM365GroupRecycleBinItemListCommand_instances, _EntraM365GroupRecycleBinItemListCommand_initTelemetry, _EntraM365GroupRecycleBinItemListCommand_initOptions;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { formatting } from '../../../../utils/formatting.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,
+    groupName: z.string().optional().alias('d'),
+    groupMailNickname: z.string().optional().alias('m')
+});
 class EntraM365GroupRecycleBinItemListCommand extends GraphCommand {
     get name() {
         return commands.M365GROUP_RECYCLEBINITEM_LIST;
@@ -15,11 +16,8 @@ class EntraM365GroupRecycleBinItemListCommand extends GraphCommand {
     get description() {
         return 'Lists Microsoft 365 Groups deleted in the current tenant';
     }
-    constructor() {
-        super();
-        _EntraM365GroupRecycleBinItemListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraM365GroupRecycleBinItemListCommand_instances, "m", _EntraM365GroupRecycleBinItemListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupRecycleBinItemListCommand_instances, "m", _EntraM365GroupRecycleBinItemListCommand_initOptions).call(this);
+    get schema() {
+        return options;
     }
     defaultProperties() {
         return ['id', 'displayName', 'mailNickname'];
@@ -39,19 +37,5 @@ class EntraM365GroupRecycleBinItemListCommand extends GraphCommand {
         }
     }
 }
-_EntraM365GroupRecycleBinItemListCommand_instances = new WeakSet(), _EntraM365GroupRecycleBinItemListCommand_initTelemetry = function _EntraM365GroupRecycleBinItemListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            groupName: typeof args.options.groupName !== 'undefined',
-            groupMailNickname: typeof args.options.groupMailNickname !== 'undefined'
-        });
-    });
-}, _EntraM365GroupRecycleBinItemListCommand_initOptions = function _EntraM365GroupRecycleBinItemListCommand_initOptions() {
-    this.options.unshift({
-        option: '-d, --groupName [groupName]'
-    }, {
-        option: '-m, --groupMailNickname [groupMailNickname]'
-    });
-};
 export default new EntraM365GroupRecycleBinItemListCommand();
 //# sourceMappingURL=m365group-recyclebinitem-list.js.map

package/dist/m365/entra/commands/m365group/m365group-recyclebinitem-remove.js

@@ -1,15 +1,17 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _EntraM365GroupRecycleBinItemRemoveCommand_instances, _EntraM365GroupRecycleBinItemRemoveCommand_initTelemetry, _EntraM365GroupRecycleBinItemRemoveCommand_initOptions, _EntraM365GroupRecycleBinItemRemoveCommand_initValidators, _EntraM365GroupRecycleBinItemRemoveCommand_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';
 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('d'),
+    mailNickname: z.string().optional().alias('m'),
+    force: z.boolean().optional().alias('f')
+});
 class EntraM365GroupRecycleBinItemRemoveCommand extends GraphCommand {
     get name() {
         return commands.M365GROUP_RECYCLEBINITEM_REMOVE;
@@ -17,13 +19,18 @@ class EntraM365GroupRecycleBinItemRemoveCommand extends GraphCommand {
     get description() {
         return 'Permanently deletes a Microsoft 365 Group from the recycle bin in the current tenant';
     }
-    constructor() {
-        super();
-        _EntraM365GroupRecycleBinItemRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraM365GroupRecycleBinItemRemoveCommand_instances, "m", _EntraM365GroupRecycleBinItemRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupRecycleBinItemRemoveCommand_instances, "m", _EntraM365GroupRecycleBinItemRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupRecycleBinItemRemoveCommand_instances, "m", _EntraM365GroupRecycleBinItemRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupRecycleBinItemRemoveCommand_instances, "m", _EntraM365GroupRecycleBinItemRemoveCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.id, opts.displayName, opts.mailNickname].filter(o => o !== undefined).length === 1, {
+            error: 'Use one of the following options: id, displayName or mailNickname.',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'displayName', 'mailNickname']
+            }
+        });
     }
     async commandAction(logger, args) {
         const removeGroup = async () => {
@@ -84,34 +91,5 @@ class EntraM365GroupRecycleBinItemRemoveCommand extends GraphCommand {
         return groups[0].id;
     }
 }
-_EntraM365GroupRecycleBinItemRemoveCommand_instances = new WeakSet(), _EntraM365GroupRecycleBinItemRemoveCommand_initTelemetry = function _EntraM365GroupRecycleBinItemRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            id: typeof args.options.id !== 'undefined',
-            displayName: typeof args.options.displayName !== 'undefined',
-            mailNickname: typeof args.options.mailNickname !== 'undefined',
-            force: !!args.options.force
-        });
-    });
-}, _EntraM365GroupRecycleBinItemRemoveCommand_initOptions = function _EntraM365GroupRecycleBinItemRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id [id]'
-    }, {
-        option: '-d, --displayName [displayName]'
-    }, {
-        option: '-m, --mailNickname [mailNickname]'
-    }, {
-        option: '-f, --force'
-    });
-}, _EntraM365GroupRecycleBinItemRemoveCommand_initValidators = function _EntraM365GroupRecycleBinItemRemoveCommand_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;
-    });
-}, _EntraM365GroupRecycleBinItemRemoveCommand_initOptionSets = function _EntraM365GroupRecycleBinItemRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'displayName', 'mailNickname'] });
-};
 export default new EntraM365GroupRecycleBinItemRemoveCommand();
 //# sourceMappingURL=m365group-recyclebinitem-remove.js.map

package/dist/m365/entra/commands/m365group/m365group-recyclebinitem-restore.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 _EntraM365GroupRecycleBinItemRestoreCommand_instances, _EntraM365GroupRecycleBinItemRestoreCommand_initTelemetry, _EntraM365GroupRecycleBinItemRestoreCommand_initOptions, _EntraM365GroupRecycleBinItemRestoreCommand_initValidators, _EntraM365GroupRecycleBinItemRestoreCommand_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';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-import { cli } from '../../../../cli/cli.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    id: z.uuid().optional().alias('i'),
+    displayName: z.string().optional().alias('d'),
+    mailNickname: z.string().optional().alias('m')
+});
 class EntraM365GroupRecycleBinItemRestoreCommand extends GraphCommand {
     get name() {
         return commands.M365GROUP_RECYCLEBINITEM_RESTORE;
@@ -17,13 +18,18 @@ class EntraM365GroupRecycleBinItemRestoreCommand extends GraphCommand {
     get description() {
         return 'Restores a deleted Microsoft 365 Group';
     }
-    constructor() {
-        super();
-        _EntraM365GroupRecycleBinItemRestoreCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraM365GroupRecycleBinItemRestoreCommand_instances, "m", _EntraM365GroupRecycleBinItemRestoreCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupRecycleBinItemRestoreCommand_instances, "m", _EntraM365GroupRecycleBinItemRestoreCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupRecycleBinItemRestoreCommand_instances, "m", _EntraM365GroupRecycleBinItemRestoreCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupRecycleBinItemRestoreCommand_instances, "m", _EntraM365GroupRecycleBinItemRestoreCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.id, opts.displayName, opts.mailNickname].filter(o => o !== undefined).length === 1, {
+            error: 'Use one of the following options: id, displayName or mailNickname.',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'displayName', 'mailNickname']
+            }
+        });
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -77,31 +83,5 @@ class EntraM365GroupRecycleBinItemRestoreCommand extends GraphCommand {
         return groups[0].id;
     }
 }
-_EntraM365GroupRecycleBinItemRestoreCommand_instances = new WeakSet(), _EntraM365GroupRecycleBinItemRestoreCommand_initTelemetry = function _EntraM365GroupRecycleBinItemRestoreCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            id: typeof args.options.id !== 'undefined',
-            displayName: typeof args.options.displayName !== 'undefined',
-            mailNickname: typeof args.options.mailNickname !== 'undefined'
-        });
-    });
-}, _EntraM365GroupRecycleBinItemRestoreCommand_initOptions = function _EntraM365GroupRecycleBinItemRestoreCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id [id]'
-    }, {
-        option: '-d, --displayName [displayName]'
-    }, {
-        option: '-m, --mailNickname [mailNickname]'
-    });
-}, _EntraM365GroupRecycleBinItemRestoreCommand_initValidators = function _EntraM365GroupRecycleBinItemRestoreCommand_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;
-    });
-}, _EntraM365GroupRecycleBinItemRestoreCommand_initOptionSets = function _EntraM365GroupRecycleBinItemRestoreCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'displayName', 'mailNickname'] });
-};
 export default new EntraM365GroupRecycleBinItemRestoreCommand();
 //# sourceMappingURL=m365group-recyclebinitem-restore.js.map

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

@@ -1,35 +1,44 @@
-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 _EntraM365GroupRemoveCommand_instances, _EntraM365GroupRemoveCommand_initTelemetry, _EntraM365GroupRemoveCommand_initOptions, _EntraM365GroupRemoveCommand_initValidators, _EntraM365GroupRemoveCommand_initOptionSets, _EntraM365GroupRemoveCommand_initTypes;
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.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';
 import config from '../../../../config.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
 import { setTimeout } from 'timers/promises';
+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'),
+    permanent: z.boolean().optional()
+});
 class EntraM365GroupRemoveCommand extends GraphCommand {
+    constructor() {
+        super(...arguments);
+        this.intervalInMs = 5000;
+    }
     get name() {
         return commands.M365GROUP_REMOVE;
     }
     get description() {
         return 'Removes a Microsoft 365 Group';
     }
-    constructor() {
-        super();
-        _EntraM365GroupRemoveCommand_instances.add(this);
-        this.intervalInMs = 5000;
-        __classPrivateFieldGet(this, _EntraM365GroupRemoveCommand_instances, "m", _EntraM365GroupRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupRemoveCommand_instances, "m", _EntraM365GroupRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupRemoveCommand_instances, "m", _EntraM365GroupRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupRemoveCommand_instances, "m", _EntraM365GroupRemoveCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupRemoveCommand_instances, "m", _EntraM365GroupRemoveCommand_initTypes).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.id, opts.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 () => {
@@ -165,36 +174,6 @@ class EntraM365GroupRemoveCommand extends GraphCommand {
         }
     }
 }
-_EntraM365GroupRemoveCommand_instances = new WeakSet(), _EntraM365GroupRemoveCommand_initTelemetry = function _EntraM365GroupRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            force: (!(!args.options.force)).toString(),
-            permanent: !!args.options.permanent
-        });
-    });
-}, _EntraM365GroupRemoveCommand_initOptions = function _EntraM365GroupRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id [id]'
-    }, {
-        option: '-n, --displayName [displayName]'
-    }, {
-        option: '-f, --force'
-    }, {
-        option: '--permanent'
-    });
-}, _EntraM365GroupRemoveCommand_initValidators = function _EntraM365GroupRemoveCommand_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;
-    });
-}, _EntraM365GroupRemoveCommand_initOptionSets = function _EntraM365GroupRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'displayName'] });
-}, _EntraM365GroupRemoveCommand_initTypes = function _EntraM365GroupRemoveCommand_initTypes() {
-    this.types.string.push('id', 'displayName');
-    this.types.boolean.push('permanent');
-};
 EntraM365GroupRemoveCommand.maxRetries = 10;
 export default new EntraM365GroupRemoveCommand();
 //# sourceMappingURL=m365group-remove.js.map

package/dist/m365/entra/commands/m365group/m365group-renew.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 _EntraM365GroupRenewCommand_instances, _EntraM365GroupRenewCommand_initOptions, _EntraM365GroupRenewCommand_initValidators, _EntraM365GroupRenewCommand_initOptionSets, _EntraM365GroupRenewCommand_initTypes;
+import { z } from 'zod';
+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')
+});
 class EntraM365GroupRenewCommand extends GraphCommand {
     get name() {
         return commands.M365GROUP_RENEW;
@@ -16,13 +16,18 @@ class EntraM365GroupRenewCommand extends GraphCommand {
     get description() {
         return `Renews Microsoft 365 group's expiration`;
     }
-    constructor() {
-        super();
-        _EntraM365GroupRenewCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraM365GroupRenewCommand_instances, "m", _EntraM365GroupRenewCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupRenewCommand_instances, "m", _EntraM365GroupRenewCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupRenewCommand_instances, "m", _EntraM365GroupRenewCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupRenewCommand_instances, "m", _EntraM365GroupRenewCommand_initTypes).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.id, opts.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) {
         if (this.verbose) {
@@ -50,23 +55,5 @@ class EntraM365GroupRenewCommand extends GraphCommand {
         }
     }
 }
-_EntraM365GroupRenewCommand_instances = new WeakSet(), _EntraM365GroupRenewCommand_initOptions = function _EntraM365GroupRenewCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id [id]'
-    }, {
-        option: '-n, --displayName [displayName]'
-    });
-}, _EntraM365GroupRenewCommand_initValidators = function _EntraM365GroupRenewCommand_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;
-    });
-}, _EntraM365GroupRenewCommand_initOptionSets = function _EntraM365GroupRenewCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'displayName'] });
-}, _EntraM365GroupRenewCommand_initTypes = function _EntraM365GroupRenewCommand_initTypes() {
-    this.types.string.push('id', 'displayName');
-};
 export default new EntraM365GroupRenewCommand();
 //# sourceMappingURL=m365group-renew.js.map