@pnp/cli-microsoft365 11.9.0-beta.7b34e40 → 11.9.0-beta.87e70e2

package/dist/m365/entra/commands/user/user-license-add.js

@@ -1,14 +1,18 @@
-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 _EntraUserLicenseAddCommand_instances, _EntraUserLicenseAddCommand_initTelemetry, _EntraUserLicenseAddCommand_initOptions, _EntraUserLicenseAddCommand_initValidators, _EntraUserLicenseAddCommand_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 GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    userId: z.uuid().optional(),
+    userName: z.string().optional(),
+    ids: z.string().refine(ids => !ids.split(',').some(e => !validation.isValidGuid(e)), {
+        error: e => `'${e.input}' contains one or more invalid GUIDs.`
+    })
+});
 class EntraUserLicenseAddCommand extends GraphCommand {
     get name() {
         return commands.USER_LICENSE_ADD;
@@ -16,19 +20,24 @@ class EntraUserLicenseAddCommand extends GraphCommand {
     get description() {
         return 'Assigns a license to a user';
     }
-    constructor() {
-        super();
-        _EntraUserLicenseAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraUserLicenseAddCommand_instances, "m", _EntraUserLicenseAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraUserLicenseAddCommand_instances, "m", _EntraUserLicenseAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraUserLicenseAddCommand_instances, "m", _EntraUserLicenseAddCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraUserLicenseAddCommand_instances, "m", _EntraUserLicenseAddCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => [options.userId, options.userName].filter(o => o !== undefined).length === 1, {
+            error: `Specify either 'userId' or 'userName'.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['userId', 'userName']
+            }
+        });
     }
     async commandAction(logger, args) {
         const addLicenses = args.options.ids.split(',').map(x => { return { "disabledPlans": [], "skuId": x }; });
         const requestBody = { "addLicenses": addLicenses, "removeLicenses": [] };
         const requestOptions = {
-            url: `${this.resource}/v1.0/users/${formatting.encodeQueryParameter(args.options.userId || args.options.userName)}/assignLicense`,
+            url: `${this.resource}/v1.0/users/${formatting.encodeQueryParameter(args.options.userId ?? args.options.userName)}/assignLicense`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },
@@ -44,33 +53,5 @@ class EntraUserLicenseAddCommand extends GraphCommand {
         }
     }
 }
-_EntraUserLicenseAddCommand_instances = new WeakSet(), _EntraUserLicenseAddCommand_initTelemetry = function _EntraUserLicenseAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            userId: typeof args.options.userId !== 'undefined',
-            userName: typeof args.options.userName !== 'undefined'
-        });
-    });
-}, _EntraUserLicenseAddCommand_initOptions = function _EntraUserLicenseAddCommand_initOptions() {
-    this.options.unshift({
-        option: '--userId [userId]'
-    }, {
-        option: '--userName [userName]'
-    }, {
-        option: '--ids <ids>'
-    });
-}, _EntraUserLicenseAddCommand_initValidators = function _EntraUserLicenseAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.userId && !validation.isValidGuid(args.options.userId)) {
-            return `${args.options.userId} is not a valid GUID`;
-        }
-        if (args.options.ids && args.options.ids.split(',').some(e => !validation.isValidGuid(e))) {
-            return `${args.options.ids} contains one or more invalid GUIDs`;
-        }
-        return true;
-    });
-}, _EntraUserLicenseAddCommand_initOptionSets = function _EntraUserLicenseAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['userId', 'userName'] });
-};
 export default new EntraUserLicenseAddCommand();
 //# sourceMappingURL=user-license-add.js.map

package/dist/m365/entra/commands/user/user-license-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 _EntraUserLicenseListCommand_instances, _EntraUserLicenseListCommand_initTelemetry, _EntraUserLicenseListCommand_initOptions, _EntraUserLicenseListCommand_initValidators, _EntraUserLicenseListCommand_initOptionSets;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { odata } from '../../../../utils/odata.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import commands from '../../commands.js';
 import GraphDelegatedCommand from '../../../base/GraphDelegatedCommand.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    userId: z.uuid().optional(),
+    userName: z.string().refine(name => validation.isValidUserPrincipalName(name), {
+        error: e => `'${e.input}' is not a valid user principal name (UPN).`
+    }).optional()
+});
 class EntraUserLicenseListCommand extends GraphDelegatedCommand {
     get name() {
         return commands.USER_LICENSE_LIST;
@@ -19,13 +22,18 @@ class EntraUserLicenseListCommand extends GraphDelegatedCommand {
     defaultProperties() {
         return ['id', 'skuId', 'skuPartNumber'];
     }
-    constructor() {
-        super();
-        _EntraUserLicenseListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraUserLicenseListCommand_instances, "m", _EntraUserLicenseListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraUserLicenseListCommand_instances, "m", _EntraUserLicenseListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraUserLicenseListCommand_instances, "m", _EntraUserLicenseListCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraUserLicenseListCommand_instances, "m", _EntraUserLicenseListCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => !options.userId || !options.userName, {
+            error: `Specify either 'userId' or 'userName', but not both.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['userId', 'userName']
+            }
+        });
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -48,34 +56,5 @@ class EntraUserLicenseListCommand extends GraphDelegatedCommand {
         }
     }
 }
-_EntraUserLicenseListCommand_instances = new WeakSet(), _EntraUserLicenseListCommand_initTelemetry = function _EntraUserLicenseListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            userId: typeof args.options.userId !== 'undefined',
-            userName: typeof args.options.userName !== 'undefined'
-        });
-    });
-}, _EntraUserLicenseListCommand_initOptions = function _EntraUserLicenseListCommand_initOptions() {
-    this.options.unshift({
-        option: '--userId [userId]'
-    }, {
-        option: '--userName [userName]'
-    });
-}, _EntraUserLicenseListCommand_initValidators = function _EntraUserLicenseListCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.userId && !validation.isValidGuid(args.options.userId)) {
-            return `${args.options.userId} is not a valid GUID`;
-        }
-        if (args.options.userName && !validation.isValidUserPrincipalName(args.options.userName)) {
-            return `${args.options.userName} is not a valid user principal name (UPN)`;
-        }
-        return true;
-    });
-}, _EntraUserLicenseListCommand_initOptionSets = function _EntraUserLicenseListCommand_initOptionSets() {
-    this.optionSets.push({
-        options: ['userId', 'userName'],
-        runsWhen: (args) => args.options.userId || args.options.userName
-    });
-};
 export default new EntraUserLicenseListCommand();
 //# sourceMappingURL=user-license-list.js.map

package/dist/m365/entra/commands/user/user-license-remove.js

@@ -1,15 +1,22 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _EntraUserLicenseRemoveCommand_instances, _EntraUserLicenseRemoveCommand_initTelemetry, _EntraUserLicenseRemoveCommand_initOptions, _EntraUserLicenseRemoveCommand_initOptionSets, _EntraUserLicenseRemoveCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import commands from '../../commands.js';
 import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { cli } from '../../../../cli/cli.js';
 import GraphCommand from '../../../base/GraphCommand.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    userId: z.uuid().optional(),
+    userName: z.string().refine(name => validation.isValidUserPrincipalName(name), {
+        error: e => `'${e.input}' is not a valid user principal name (UPN).`
+    }).optional(),
+    ids: z.string().refine(ids => !ids.split(',').some(e => !validation.isValidGuid(e)), {
+        error: e => `'${e.input}' contains one or more invalid GUIDs.`
+    }),
+    force: z.boolean().optional().alias('f')
+});
 class EntraUserLicenseRemoveCommand extends GraphCommand {
     get name() {
         return commands.USER_LICENSE_REMOVE;
@@ -17,13 +24,18 @@ class EntraUserLicenseRemoveCommand extends GraphCommand {
     get description() {
         return 'Removes a license from a user';
     }
-    constructor() {
-        super();
-        _EntraUserLicenseRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraUserLicenseRemoveCommand_instances, "m", _EntraUserLicenseRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraUserLicenseRemoveCommand_instances, "m", _EntraUserLicenseRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraUserLicenseRemoveCommand_instances, "m", _EntraUserLicenseRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraUserLicenseRemoveCommand_instances, "m", _EntraUserLicenseRemoveCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => [options.userId, options.userName].filter(o => o !== undefined).length === 1, {
+            error: `Specify either 'userId' or 'userName'.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['userId', 'userName']
+            }
+        });
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -58,39 +70,5 @@ class EntraUserLicenseRemoveCommand extends GraphCommand {
         }
     }
 }
-_EntraUserLicenseRemoveCommand_instances = new WeakSet(), _EntraUserLicenseRemoveCommand_initTelemetry = function _EntraUserLicenseRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            userId: typeof args.options.userId !== 'undefined',
-            userName: typeof args.options.userName !== 'undefined',
-            force: !!args.options.force
-        });
-    });
-}, _EntraUserLicenseRemoveCommand_initOptions = function _EntraUserLicenseRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '--userId [userId]'
-    }, {
-        option: '--userName [userName]'
-    }, {
-        option: '--ids <ids>'
-    }, {
-        option: '-f, --force'
-    });
-}, _EntraUserLicenseRemoveCommand_initOptionSets = function _EntraUserLicenseRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['userId', 'userName'] });
-}, _EntraUserLicenseRemoveCommand_initValidators = function _EntraUserLicenseRemoveCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.userId && !validation.isValidGuid(args.options.userId)) {
-            return `${args.options.userId} is not a valid GUID`;
-        }
-        if (args.options.userName && !validation.isValidUserPrincipalName(args.options.userName)) {
-            return `${args.options.userName} is not a valid user principal name (UPN)`;
-        }
-        if (args.options.ids && args.options.ids.split(',').some(e => !validation.isValidGuid(e))) {
-            return `${args.options.ids} contains one or more invalid GUIDs`;
-        }
-        return true;
-    });
-};
 export default new EntraUserLicenseRemoveCommand();
 //# sourceMappingURL=user-license-remove.js.map

package/dist/m365/entra/commands/user/user-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 _EntraUserListCommand_instances, _a, _EntraUserListCommand_initTelemetry, _EntraUserListCommand_initOptions, _EntraUserListCommand_initValidators, _EntraUserListCommand_initTypes;
+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';
 import { optionsUtils } from '../../../../utils/optionsUtils.js';
+import { zod } from '../../../../utils/zod.js';
+const allowedTypes = { Member: 'Member', Guest: 'Guest' };
+export const options = z.looseObject({
+    ...globalOptionsZod.shape,
+    type: zod.coercedEnum(allowedTypes).optional(),
+    properties: z.string().optional().alias('p')
+});
 class EntraUserListCommand extends GraphCommand {
     get name() {
         return commands.USER_LIST;
@@ -22,13 +25,8 @@ class EntraUserListCommand extends GraphCommand {
     defaultProperties() {
         return ['id', 'displayName', 'mail', 'userPrincipalName'];
     }
-    constructor() {
-        super();
-        _EntraUserListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraUserListCommand_instances, "m", _EntraUserListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraUserListCommand_instances, "m", _EntraUserListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraUserListCommand_instances, "m", _EntraUserListCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraUserListCommand_instances, "m", _EntraUserListCommand_initTypes).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         try {
@@ -57,7 +55,7 @@ class EntraUserListCommand extends GraphCommand {
     }
     getFilter(options) {
         const filters = [];
-        const unknownOptions = optionsUtils.getUnknownOptions(options, this.options);
+        const unknownOptions = optionsUtils.getUnknownOptions(options, zod.schemaToOptions(this.schema));
         Object.keys(unknownOptions).forEach(key => {
             if (typeof options[key] === 'boolean') {
                 throw `Specify value for the ${key} property`;
@@ -73,30 +71,5 @@ class EntraUserListCommand extends GraphCommand {
         return null;
     }
 }
-_a = EntraUserListCommand, _EntraUserListCommand_instances = new WeakSet(), _EntraUserListCommand_initTelemetry = function _EntraUserListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            type: typeof args.options.type !== 'undefined',
-            properties: typeof args.options.properties !== 'undefined'
-        });
-    });
-}, _EntraUserListCommand_initOptions = function _EntraUserListCommand_initOptions() {
-    this.options.unshift({
-        option: '--type [type]',
-        autocomplete: _a.allowedTypes
-    }, {
-        option: '-p, --properties [properties]'
-    });
-}, _EntraUserListCommand_initValidators = function _EntraUserListCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.type && !_a.allowedTypes.some(t => t.toLowerCase() === args.options.type.toLowerCase())) {
-            return `'${args.options.type}' is not a valid value for option 'type'. Allowed values are: ${_a.allowedTypes.join(', ')}.`;
-        }
-        return true;
-    });
-}, _EntraUserListCommand_initTypes = function _EntraUserListCommand_initTypes() {
-    this.types.string.push('type', 'properties');
-};
-EntraUserListCommand.allowedTypes = ['Member', 'Guest'];
 export default new EntraUserListCommand();
 //# sourceMappingURL=user-list.js.map

package/dist/m365/entra/commands/user/user-password-validate.js

@@ -1,23 +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 _EntraUserPasswordValidateCommand_instances, _EntraUserPasswordValidateCommand_initOptions;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    password: z.string().alias('p')
+});
 class EntraUserPasswordValidateCommand extends GraphCommand {
     get name() {
         return commands.USER_PASSWORD_VALIDATE;
     }
     get description() {
-        return "Check a user's password against the organization's password validation policy";
+        return "Checks a user's password against the organization's password validation policy";
     }
-    constructor() {
-        super();
-        _EntraUserPasswordValidateCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraUserPasswordValidateCommand_instances, "m", _EntraUserPasswordValidateCommand_initOptions).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         try {
@@ -39,10 +37,5 @@ class EntraUserPasswordValidateCommand extends GraphCommand {
         }
     }
 }
-_EntraUserPasswordValidateCommand_instances = new WeakSet(), _EntraUserPasswordValidateCommand_initOptions = function _EntraUserPasswordValidateCommand_initOptions() {
-    this.options.unshift({
-        option: '-p, --password <password>'
-    });
-};
 export default new EntraUserPasswordValidateCommand();
 //# sourceMappingURL=user-password-validate.js.map

package/dist/m365/entra/commands/user/user-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 _EntraUserRecycleBinItemClearCommand_instances, _EntraUserRecycleBinItemClearCommand_initTelemetry, _EntraUserRecycleBinItemClearCommand_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 EntraUserRecycleBinItemClearCommand extends GraphCommand {
     get name() {
         return commands.USER_RECYCLEBINITEM_CLEAR;
@@ -16,11 +16,8 @@ class EntraUserRecycleBinItemClearCommand extends GraphCommand {
     get description() {
         return 'Removes all users from the tenant recycle bin';
     }
-    constructor() {
-        super();
-        _EntraUserRecycleBinItemClearCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraUserRecycleBinItemClearCommand_instances, "m", _EntraUserRecycleBinItemClearCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraUserRecycleBinItemClearCommand_instances, "m", _EntraUserRecycleBinItemClearCommand_initOptions).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         const clearRecycleBinUsers = async () => {
@@ -70,16 +67,5 @@ class EntraUserRecycleBinItemClearCommand extends GraphCommand {
         }
     }
 }
-_EntraUserRecycleBinItemClearCommand_instances = new WeakSet(), _EntraUserRecycleBinItemClearCommand_initTelemetry = function _EntraUserRecycleBinItemClearCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            force: !!args.options.force
-        });
-    });
-}, _EntraUserRecycleBinItemClearCommand_initOptions = function _EntraUserRecycleBinItemClearCommand_initOptions() {
-    this.options.unshift({
-        option: '-f, --force'
-    });
-};
 export default new EntraUserRecycleBinItemClearCommand();
 //# sourceMappingURL=user-recyclebinitem-clear.js.map

package/dist/m365/entra/commands/user/user-recyclebinitem-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 _EntraUserRecycleBinItemRemoveCommand_instances, _EntraUserRecycleBinItemRemoveCommand_initTelemetry, _EntraUserRecycleBinItemRemoveCommand_initOptions, _EntraUserRecycleBinItemRemoveCommand_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(),
+    force: z.boolean().optional().alias('f')
+});
 class EntraUserRecycleBinItemRemoveCommand extends GraphCommand {
     get name() {
         return commands.USER_RECYCLEBINITEM_REMOVE;
@@ -16,12 +16,8 @@ class EntraUserRecycleBinItemRemoveCommand extends GraphCommand {
     get description() {
         return 'Removes a user from the recycle bin in the current tenant';
     }
-    constructor() {
-        super();
-        _EntraUserRecycleBinItemRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraUserRecycleBinItemRemoveCommand_instances, "m", _EntraUserRecycleBinItemRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraUserRecycleBinItemRemoveCommand_instances, "m", _EntraUserRecycleBinItemRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraUserRecycleBinItemRemoveCommand_instances, "m", _EntraUserRecycleBinItemRemoveCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         const clearRecycleBinItem = async () => {
@@ -50,25 +46,5 @@ class EntraUserRecycleBinItemRemoveCommand extends GraphCommand {
         }
     }
 }
-_EntraUserRecycleBinItemRemoveCommand_instances = new WeakSet(), _EntraUserRecycleBinItemRemoveCommand_initTelemetry = function _EntraUserRecycleBinItemRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            force: !!args.options.force
-        });
-    });
-}, _EntraUserRecycleBinItemRemoveCommand_initOptions = function _EntraUserRecycleBinItemRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '--id <id>'
-    }, {
-        option: '-f, --force'
-    });
-}, _EntraUserRecycleBinItemRemoveCommand_initValidators = function _EntraUserRecycleBinItemRemoveCommand_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;
-    });
-};
 export default new EntraUserRecycleBinItemRemoveCommand();
 //# sourceMappingURL=user-recyclebinitem-remove.js.map

package/dist/m365/entra/commands/user/user-recyclebinitem-restore.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 _EntraUserRecycleBinItemRestoreCommand_instances, _EntraUserRecycleBinItemRestoreCommand_initOptions, _EntraUserRecycleBinItemRestoreCommand_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()
+});
 class EntraUserRecycleBinItemRestoreCommand extends GraphCommand {
     get name() {
         return commands.USER_RECYCLEBINITEM_RESTORE;
@@ -15,11 +14,8 @@ class EntraUserRecycleBinItemRestoreCommand extends GraphCommand {
     get description() {
         return 'Restores a user from the tenant recycle bin';
     }
-    constructor() {
-        super();
-        _EntraUserRecycleBinItemRestoreCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraUserRecycleBinItemRestoreCommand_instances, "m", _EntraUserRecycleBinItemRestoreCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraUserRecycleBinItemRestoreCommand_instances, "m", _EntraUserRecycleBinItemRestoreCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -41,17 +37,5 @@ class EntraUserRecycleBinItemRestoreCommand extends GraphCommand {
         }
     }
 }
-_EntraUserRecycleBinItemRestoreCommand_instances = new WeakSet(), _EntraUserRecycleBinItemRestoreCommand_initOptions = function _EntraUserRecycleBinItemRestoreCommand_initOptions() {
-    this.options.unshift({
-        option: '--id <id>'
-    });
-}, _EntraUserRecycleBinItemRestoreCommand_initValidators = function _EntraUserRecycleBinItemRestoreCommand_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;
-    });
-};
 export default new EntraUserRecycleBinItemRestoreCommand();
 //# sourceMappingURL=user-recyclebinitem-restore.js.map