@pnp/cli-microsoft365 11.9.0-beta.8c1ee05 → 11.9.0-beta.93bd508

package/dist/m365/entra/commands/administrativeunit/administrativeunit-member-add.js

@@ -1,17 +1,23 @@
-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 _EntraAdministrativeUnitMemberAddCommand_instances, _EntraAdministrativeUnitMemberAddCommand_initTelemetry, _EntraAdministrativeUnitMemberAddCommand_initOptions, _EntraAdministrativeUnitMemberAddCommand_initValidators, _EntraAdministrativeUnitMemberAddCommand_initOptionSets;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { entraAdministrativeUnit } from "../../../../utils/entraAdministrativeUnit.js";
 import { entraGroup } from "../../../../utils/entraGroup.js";
 import { entraUser } from "../../../../utils/entraUser.js";
-import { validation } from "../../../../utils/validation.js";
 import GraphCommand from "../../../base/GraphCommand.js";
 import commands from "../../commands.js";
 import request from "../../../../request.js";
 import { entraDevice } from "../../../../utils/entraDevice.js";
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    administrativeUnitId: z.uuid().optional().alias('i'),
+    administrativeUnitName: z.string().optional().alias('n'),
+    userId: z.uuid().optional(),
+    userName: z.string().optional(),
+    groupId: z.uuid().optional(),
+    groupName: z.string().optional(),
+    deviceId: z.uuid().optional(),
+    deviceName: z.string().optional()
+});
 class EntraAdministrativeUnitMemberAddCommand extends GraphCommand {
     get name() {
         return commands.ADMINISTRATIVEUNIT_MEMBER_ADD;
@@ -19,13 +25,25 @@ class EntraAdministrativeUnitMemberAddCommand extends GraphCommand {
     get description() {
         return 'Adds a member (user, group, device) to an administrative unit';
     }
-    constructor() {
-        super();
-        _EntraAdministrativeUnitMemberAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraAdministrativeUnitMemberAddCommand_instances, "m", _EntraAdministrativeUnitMemberAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraAdministrativeUnitMemberAddCommand_instances, "m", _EntraAdministrativeUnitMemberAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraAdministrativeUnitMemberAddCommand_instances, "m", _EntraAdministrativeUnitMemberAddCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraAdministrativeUnitMemberAddCommand_instances, "m", _EntraAdministrativeUnitMemberAddCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => [options.administrativeUnitId, options.administrativeUnitName].filter(Boolean).length === 1, {
+            error: 'Specify either administrativeUnitId or administrativeUnitName',
+            params: {
+                customCode: 'optionSet',
+                options: ['administrativeUnitId', 'administrativeUnitName']
+            }
+        })
+            .refine(options => [options.userId, options.userName, options.groupId, options.groupName, options.deviceId, options.deviceName].filter(Boolean).length === 1, {
+            error: 'Specify either userId, userName, groupId, groupName, deviceId, or deviceName',
+            params: {
+                customCode: 'optionSet',
+                options: ['userId', 'userName', 'groupId', 'groupName', 'deviceId', 'deviceName']
+            }
+        });
     }
     async commandAction(logger, args) {
         let administrativeUnitId = args.options.administrativeUnitId;
@@ -84,54 +102,5 @@ class EntraAdministrativeUnitMemberAddCommand extends GraphCommand {
         }
     }
 }
-_EntraAdministrativeUnitMemberAddCommand_instances = new WeakSet(), _EntraAdministrativeUnitMemberAddCommand_initTelemetry = function _EntraAdministrativeUnitMemberAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            userId: typeof args.options.userId !== 'undefined',
-            userName: typeof args.options.userName !== 'undefined',
-            groupId: typeof args.options.groupId !== 'undefined',
-            groupName: typeof args.options.groupName !== 'undefined',
-            deviceId: typeof args.options.deviceId !== 'undefined',
-            deviceName: typeof args.options.deviceName !== 'undefined'
-        });
-    });
-}, _EntraAdministrativeUnitMemberAddCommand_initOptions = function _EntraAdministrativeUnitMemberAddCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --administrativeUnitId [administrativeUnitId]'
-    }, {
-        option: '-n, --administrativeUnitName [administrativeUnitName]'
-    }, {
-        option: "--userId [userId]"
-    }, {
-        option: "--userName [userName]"
-    }, {
-        option: "--groupId [groupId]"
-    }, {
-        option: "--groupName [groupName]"
-    }, {
-        option: "--deviceId [deviceId]"
-    }, {
-        option: "--deviceName [deviceName]"
-    });
-}, _EntraAdministrativeUnitMemberAddCommand_initValidators = function _EntraAdministrativeUnitMemberAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.administrativeUnitId && !validation.isValidGuid(args.options.administrativeUnitId)) {
-            return `${args.options.administrativeUnitId} is not a valid GUID`;
-        }
-        if (args.options.userId && !validation.isValidGuid(args.options.userId)) {
-            return `${args.options.userId} is not a valid GUID`;
-        }
-        if (args.options.groupId && !validation.isValidGuid(args.options.groupId)) {
-            return `${args.options.groupId} is not a valid GUID`;
-        }
-        if (args.options.deviceId && !validation.isValidGuid(args.options.deviceId)) {
-            return `${args.options.deviceId} is not a valid GUID`;
-        }
-        return true;
-    });
-}, _EntraAdministrativeUnitMemberAddCommand_initOptionSets = function _EntraAdministrativeUnitMemberAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['administrativeUnitId', 'administrativeUnitName'] });
-    this.optionSets.push({ options: ['userId', 'userName', 'groupId', 'groupName', 'deviceId', 'deviceName'] });
-};
 export default new EntraAdministrativeUnitMemberAddCommand();
 //# sourceMappingURL=administrativeunit-member-add.js.map

package/dist/m365/entra/commands/administrativeunit/administrativeunit-member-get.js

@@ -1,14 +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 _EntraAdministrativeUnitMemberGetCommand_instances, _EntraAdministrativeUnitMemberGetCommand_initTelemetry, _EntraAdministrativeUnitMemberGetCommand_initOptions, _EntraAdministrativeUnitMemberGetCommand_initValidators, _EntraAdministrativeUnitMemberGetCommand_initOptionSets;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-import { validation } from '../../../../utils/validation.js';
 import { entraAdministrativeUnit } from '../../../../utils/entraAdministrativeUnit.js';
 import request from '../../../../request.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    id: z.uuid().alias('i'),
+    administrativeUnitId: z.uuid().optional().alias('u'),
+    administrativeUnitName: z.string().optional().alias('n'),
+    properties: z.string().optional().alias('p')
+});
 class EntraAdministrativeUnitMemberGetCommand extends GraphCommand {
     get name() {
         return commands.ADMINISTRATIVEUNIT_MEMBER_GET;
@@ -16,13 +18,18 @@ class EntraAdministrativeUnitMemberGetCommand extends GraphCommand {
     get description() {
         return 'Retrieve a specific member (user, group, or device) of an administrative unit';
     }
-    constructor() {
-        super();
-        _EntraAdministrativeUnitMemberGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraAdministrativeUnitMemberGetCommand_instances, "m", _EntraAdministrativeUnitMemberGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraAdministrativeUnitMemberGetCommand_instances, "m", _EntraAdministrativeUnitMemberGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraAdministrativeUnitMemberGetCommand_instances, "m", _EntraAdministrativeUnitMemberGetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraAdministrativeUnitMemberGetCommand_instances, "m", _EntraAdministrativeUnitMemberGetCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => [options.administrativeUnitId, options.administrativeUnitName].filter(Boolean).length === 1, {
+            error: 'Specify either administrativeUnitId or administrativeUnitName',
+            params: {
+                customCode: 'optionSet',
+                options: ['administrativeUnitId', 'administrativeUnitName']
+            }
+        });
     }
     async commandAction(logger, args) {
         let administrativeUnitId = args.options.administrativeUnitId;
@@ -77,36 +84,5 @@ class EntraAdministrativeUnitMemberGetCommand extends GraphCommand {
         return `${this.resource}/v1.0/directory/administrativeUnits/${administrativeUnitId}/members/${memberId}${queryString}`;
     }
 }
-_EntraAdministrativeUnitMemberGetCommand_instances = new WeakSet(), _EntraAdministrativeUnitMemberGetCommand_initTelemetry = function _EntraAdministrativeUnitMemberGetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            administrativeUnitId: typeof args.options.administrativeUnitId !== 'undefined',
-            administrativeUnitName: typeof args.options.administrativeUnitName !== 'undefined',
-            properties: typeof args.options.properties !== 'undefined'
-        });
-    });
-}, _EntraAdministrativeUnitMemberGetCommand_initOptions = function _EntraAdministrativeUnitMemberGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id <id>'
-    }, {
-        option: '-u, --administrativeUnitId [administrativeUnitId]'
-    }, {
-        option: '-n, --administrativeUnitName [administrativeUnitName]'
-    }, {
-        option: '-p, --properties [properties]'
-    });
-}, _EntraAdministrativeUnitMemberGetCommand_initValidators = function _EntraAdministrativeUnitMemberGetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.id && !validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
-        }
-        if (args.options.administrativeUnitId && !validation.isValidGuid(args.options.administrativeUnitId)) {
-            return `${args.options.administrativeUnitId} is not a valid GUID`;
-        }
-        return true;
-    });
-}, _EntraAdministrativeUnitMemberGetCommand_initOptionSets = function _EntraAdministrativeUnitMemberGetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['administrativeUnitId', 'administrativeUnitName'] });
-};
 export default new EntraAdministrativeUnitMemberGetCommand();
 //# sourceMappingURL=administrativeunit-member-get.js.map

package/dist/m365/entra/commands/administrativeunit/administrativeunit-member-list.js

@@ -1,14 +1,24 @@
-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 _EntraAdministrativeUnitMemberListCommand_instances, _EntraAdministrativeUnitMemberListCommand_initTelemetry, _EntraAdministrativeUnitMemberListCommand_initOptions, _EntraAdministrativeUnitMemberListCommand_initValidators, _EntraAdministrativeUnitMemberListCommand_initOptionSets;
+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';
 import { entraAdministrativeUnit } from '../../../../utils/entraAdministrativeUnit.js';
-import { validation } from '../../../../utils/validation.js';
+import { zod } from '../../../../utils/zod.js';
+var MemberType;
+(function (MemberType) {
+    MemberType["User"] = "user";
+    MemberType["Group"] = "group";
+    MemberType["Device"] = "device";
+})(MemberType || (MemberType = {}));
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    administrativeUnitId: z.uuid().optional().alias('i'),
+    administrativeUnitName: z.string().optional().alias('n'),
+    type: zod.coercedEnum(MemberType).optional().alias('t'),
+    properties: z.string().optional().alias('p'),
+    filter: z.string().optional().alias('f')
+});
 class EntraAdministrativeUnitMemberListCommand extends GraphCommand {
     get name() {
         return commands.ADMINISTRATIVEUNIT_MEMBER_LIST;
@@ -19,13 +29,21 @@ class EntraAdministrativeUnitMemberListCommand extends GraphCommand {
     defaultProperties() {
         return ['id', 'displayName'];
     }
-    constructor() {
-        super();
-        _EntraAdministrativeUnitMemberListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraAdministrativeUnitMemberListCommand_instances, "m", _EntraAdministrativeUnitMemberListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraAdministrativeUnitMemberListCommand_instances, "m", _EntraAdministrativeUnitMemberListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraAdministrativeUnitMemberListCommand_instances, "m", _EntraAdministrativeUnitMemberListCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraAdministrativeUnitMemberListCommand_instances, "m", _EntraAdministrativeUnitMemberListCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => [options.administrativeUnitId, options.administrativeUnitName].filter(Boolean).length === 1, {
+            error: 'Specify either administrativeUnitId or administrativeUnitName',
+            params: {
+                customCode: 'optionSet',
+                options: ['administrativeUnitId', 'administrativeUnitName']
+            }
+        })
+            .refine(options => !options.filter || options.type, {
+            error: 'Filter can be specified only if type is set'
+        });
     }
     async commandAction(logger, args) {
         let administrativeUnitId = args.options.administrativeUnitId;
@@ -95,44 +113,5 @@ class EntraAdministrativeUnitMemberListCommand extends GraphCommand {
             : `${this.resource}/v1.0/directory/administrativeUnits/${administrativeUnitId}/members${queryString}`;
     }
 }
-_EntraAdministrativeUnitMemberListCommand_instances = new WeakSet(), _EntraAdministrativeUnitMemberListCommand_initTelemetry = function _EntraAdministrativeUnitMemberListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            type: typeof args.options.type !== 'undefined',
-            properties: typeof args.options.properties !== 'undefined',
-            filter: typeof args.options.filter !== 'undefined'
-        });
-    });
-}, _EntraAdministrativeUnitMemberListCommand_initOptions = function _EntraAdministrativeUnitMemberListCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --administrativeUnitId [administrativeUnitId]'
-    }, {
-        option: '-n, --administrativeUnitName [administrativeUnitName]'
-    }, {
-        option: '-t, --type [type]',
-        autocomplete: ['user', 'group', 'device']
-    }, {
-        option: '-p, --properties [properties]'
-    }, {
-        option: '-f, --filter [filter]'
-    });
-}, _EntraAdministrativeUnitMemberListCommand_initValidators = function _EntraAdministrativeUnitMemberListCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.administrativeUnitId && !validation.isValidGuid(args.options.administrativeUnitId)) {
-            return `${args.options.administrativeUnitId} is not a valid GUID`;
-        }
-        if (args.options.type) {
-            if (['user', 'group', 'device'].every(type => type !== args.options.type)) {
-                return `${args.options.type} is not a valid type value. Allowed values user|group|device`;
-            }
-        }
-        if (args.options.filter && !args.options.type) {
-            return 'Filter can be specified only if type is set';
-        }
-        return true;
-    });
-}, _EntraAdministrativeUnitMemberListCommand_initOptionSets = function _EntraAdministrativeUnitMemberListCommand_initOptionSets() {
-    this.optionSets.push({ options: ['administrativeUnitId', 'administrativeUnitName'] });
-};
 export default new EntraAdministrativeUnitMemberListCommand();
 //# sourceMappingURL=administrativeunit-member-list.js.map

package/dist/m365/entra/commands/administrativeunit/administrativeunit-member-remove.js

@@ -1,18 +1,26 @@
-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 _EntraAdministrativeUnitMemberRemoveCommand_instances, _EntraAdministrativeUnitMemberRemoveCommand_initTelemetry, _EntraAdministrativeUnitMemberRemoveCommand_initOptions, _EntraAdministrativeUnitMemberRemoveCommand_initValidators, _EntraAdministrativeUnitMemberRemoveCommand_initOptionSets;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { entraAdministrativeUnit } from '../../../../utils/entraAdministrativeUnit.js';
 import { entraDevice } from '../../../../utils/entraDevice.js';
 import { entraGroup } from '../../../../utils/entraGroup.js';
 import { entraUser } from '../../../../utils/entraUser.js';
-import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 import request from '../../../../request.js';
 import { cli } from '../../../../cli/cli.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    id: z.uuid().optional().alias('i'),
+    userId: z.uuid().optional(),
+    userName: z.string().optional(),
+    groupId: z.uuid().optional(),
+    groupName: z.string().optional(),
+    deviceId: z.uuid().optional(),
+    deviceName: z.string().optional(),
+    administrativeUnitId: z.uuid().optional(),
+    administrativeUnitName: z.string().optional(),
+    force: z.boolean().optional().alias('f')
+});
 class EntraAdministrativeUnitMemberRemoveCommand extends GraphCommand {
     get name() {
         return commands.ADMINISTRATIVEUNIT_MEMBER_REMOVE;
@@ -20,13 +28,25 @@ class EntraAdministrativeUnitMemberRemoveCommand extends GraphCommand {
     get description() {
         return 'Remove a specific member (user, group, or device) from an administrative unit';
     }
-    constructor() {
-        super();
-        _EntraAdministrativeUnitMemberRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraAdministrativeUnitMemberRemoveCommand_instances, "m", _EntraAdministrativeUnitMemberRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraAdministrativeUnitMemberRemoveCommand_instances, "m", _EntraAdministrativeUnitMemberRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraAdministrativeUnitMemberRemoveCommand_instances, "m", _EntraAdministrativeUnitMemberRemoveCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _EntraAdministrativeUnitMemberRemoveCommand_instances, "m", _EntraAdministrativeUnitMemberRemoveCommand_initTelemetry).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => [options.administrativeUnitId, options.administrativeUnitName].filter(Boolean).length === 1, {
+            error: 'Specify either administrativeUnitId or administrativeUnitName',
+            params: {
+                customCode: 'optionSet',
+                options: ['administrativeUnitId', 'administrativeUnitName']
+            }
+        })
+            .refine(options => [options.id, options.userId, options.userName, options.groupId, options.groupName, options.deviceId, options.deviceName].filter(Boolean).length === 1, {
+            error: 'Specify either id, userId, userName, groupId, groupName, deviceId, or deviceName',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'userId', 'userName', 'groupId', 'groupName', 'deviceId', 'deviceName']
+            }
+        });
     }
     async commandAction(logger, args) {
         const removeAdministrativeUnitMember = async () => {
@@ -89,65 +109,5 @@ class EntraAdministrativeUnitMemberRemoveCommand extends GraphCommand {
         }
     }
 }
-_EntraAdministrativeUnitMemberRemoveCommand_instances = new WeakSet(), _EntraAdministrativeUnitMemberRemoveCommand_initTelemetry = function _EntraAdministrativeUnitMemberRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            id: typeof args.options.id !== 'undefined',
-            userId: typeof args.options.userId !== 'undefined',
-            userName: typeof args.options.userName !== 'undefined',
-            groupId: typeof args.options.groupId !== 'undefined',
-            groupName: typeof args.options.groupName !== 'undefined',
-            deviceId: typeof args.options.deviceId !== 'undefined',
-            deviceName: typeof args.options.deviceName !== 'undefined',
-            administrativeUnitId: typeof args.options.administrativeUnitId !== 'undefined',
-            administrativeUnitName: typeof args.options.administrativeUnitName !== 'undefined',
-            force: !!args.options.force
-        });
-    });
-}, _EntraAdministrativeUnitMemberRemoveCommand_initOptions = function _EntraAdministrativeUnitMemberRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id [id]'
-    }, {
-        option: "--userId [userId]"
-    }, {
-        option: "--userName [userName]"
-    }, {
-        option: "--groupId [groupId]"
-    }, {
-        option: "--groupName [groupName]"
-    }, {
-        option: "--deviceId [deviceId]"
-    }, {
-        option: "--deviceName [deviceName]"
-    }, {
-        option: '--administrativeUnitId [administrativeUnitId]'
-    }, {
-        option: '--administrativeUnitName [administrativeUnitName]'
-    }, {
-        option: '-f, --force'
-    });
-}, _EntraAdministrativeUnitMemberRemoveCommand_initValidators = function _EntraAdministrativeUnitMemberRemoveCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.administrativeUnitId && !validation.isValidGuid(args.options.administrativeUnitId)) {
-            return `${args.options.administrativeUnitId} is not a valid GUID`;
-        }
-        if (args.options.id && !validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
-        }
-        if (args.options.userId && !validation.isValidGuid(args.options.userId)) {
-            return `${args.options.userId} is not a valid GUID`;
-        }
-        if (args.options.groupId && !validation.isValidGuid(args.options.groupId)) {
-            return `${args.options.groupId} is not a valid GUID`;
-        }
-        if (args.options.deviceId && !validation.isValidGuid(args.options.deviceId)) {
-            return `${args.options.deviceId} is not a valid GUID`;
-        }
-        return true;
-    });
-}, _EntraAdministrativeUnitMemberRemoveCommand_initOptionSets = function _EntraAdministrativeUnitMemberRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['administrativeUnitId', 'administrativeUnitName'] });
-    this.optionSets.push({ options: ['id', 'userId', 'userName', 'groupId', 'groupName', 'deviceId', 'deviceName'] });
-};
 export default new EntraAdministrativeUnitMemberRemoveCommand();
 //# sourceMappingURL=administrativeunit-member-remove.js.map

package/dist/m365/entra/commands/administrativeunit/administrativeunit-roleassignment-add.js

@@ -1,16 +1,20 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _EntraAdministrativeUnitRoleAssignmentAddCommand_instances, _EntraAdministrativeUnitRoleAssignmentAddCommand_initTelemetry, _EntraAdministrativeUnitRoleAssignmentAddCommand_initOptions, _EntraAdministrativeUnitRoleAssignmentAddCommand_initValidators, _EntraAdministrativeUnitRoleAssignmentAddCommand_initOptionSets;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { entraAdministrativeUnit } from '../../../../utils/entraAdministrativeUnit.js';
 import { entraUser } from '../../../../utils/entraUser.js';
 import { roleAssignment } from '../../../../utils/roleAssignment.js';
 import { roleDefinition } from '../../../../utils/roleDefinition.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,
+    administrativeUnitId: z.uuid().optional().alias('i'),
+    administrativeUnitName: z.string().optional().alias('n'),
+    roleDefinitionId: z.uuid().optional(),
+    roleDefinitionName: z.string().optional(),
+    userId: z.uuid().optional(),
+    userName: z.string().optional()
+});
 class EntraAdministrativeUnitRoleAssignmentAddCommand extends GraphCommand {
     get name() {
         return commands.ADMINISTRATIVEUNIT_ROLEASSIGNMENT_ADD;
@@ -18,13 +22,32 @@ class EntraAdministrativeUnitRoleAssignmentAddCommand extends GraphCommand {
     get description() {
         return 'Assigns a Microsoft Entra role with administrative unit scope to a user';
     }
-    constructor() {
-        super();
-        _EntraAdministrativeUnitRoleAssignmentAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraAdministrativeUnitRoleAssignmentAddCommand_instances, "m", _EntraAdministrativeUnitRoleAssignmentAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraAdministrativeUnitRoleAssignmentAddCommand_instances, "m", _EntraAdministrativeUnitRoleAssignmentAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraAdministrativeUnitRoleAssignmentAddCommand_instances, "m", _EntraAdministrativeUnitRoleAssignmentAddCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraAdministrativeUnitRoleAssignmentAddCommand_instances, "m", _EntraAdministrativeUnitRoleAssignmentAddCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => [options.administrativeUnitId, options.administrativeUnitName].filter(Boolean).length === 1, {
+            error: 'Specify either administrativeUnitId or administrativeUnitName',
+            params: {
+                customCode: 'optionSet',
+                options: ['administrativeUnitId', 'administrativeUnitName']
+            }
+        })
+            .refine(options => [options.roleDefinitionId, options.roleDefinitionName].filter(Boolean).length === 1, {
+            error: 'Specify either roleDefinitionId or roleDefinitionName',
+            params: {
+                customCode: 'optionSet',
+                options: ['roleDefinitionId', 'roleDefinitionName']
+            }
+        })
+            .refine(options => [options.userId, options.userName].filter(Boolean).length === 1, {
+            error: 'Specify either userId or userName',
+            params: {
+                customCode: 'optionSet',
+                options: ['userId', 'userName']
+            }
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -55,48 +78,5 @@ class EntraAdministrativeUnitRoleAssignmentAddCommand extends GraphCommand {
         }
     }
 }
-_EntraAdministrativeUnitRoleAssignmentAddCommand_instances = new WeakSet(), _EntraAdministrativeUnitRoleAssignmentAddCommand_initTelemetry = function _EntraAdministrativeUnitRoleAssignmentAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            administrativeUnitId: typeof args.options.administrativeUnitId !== 'undefined',
-            administrativeUnitName: typeof args.options.administrativeUnitName !== 'undefined',
-            roleDefinitionId: typeof args.options.roleDefinitionId !== 'undefined',
-            roleDefinitionName: typeof args.options.roleDefinitionName !== 'undefined',
-            userId: typeof args.options.userId !== 'undefined',
-            userName: typeof args.options.userName !== 'undefined'
-        });
-    });
-}, _EntraAdministrativeUnitRoleAssignmentAddCommand_initOptions = function _EntraAdministrativeUnitRoleAssignmentAddCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --administrativeUnitId [administrativeUnitId]'
-    }, {
-        option: '-n, --administrativeUnitName [administrativeUnitName]'
-    }, {
-        option: '--roleDefinitionId [roleDefinitionId]'
-    }, {
-        option: '--roleDefinitionName [roleDefinitionName]'
-    }, {
-        option: '--userId [userId]'
-    }, {
-        option: '--userName [userName]'
-    });
-}, _EntraAdministrativeUnitRoleAssignmentAddCommand_initValidators = function _EntraAdministrativeUnitRoleAssignmentAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.administrativeUnitId && !validation.isValidGuid(args.options.administrativeUnitId)) {
-            return `${args.options.administrativeUnitId} is not a valid GUID`;
-        }
-        if (args.options.roleDefinitionId && !validation.isValidGuid(args.options.roleDefinitionId)) {
-            return `${args.options.roleDefinitionId} is not a valid GUID`;
-        }
-        if (args.options.userId && !validation.isValidGuid(args.options.userId)) {
-            return `${args.options.userId} is not a valid GUID`;
-        }
-        return true;
-    });
-}, _EntraAdministrativeUnitRoleAssignmentAddCommand_initOptionSets = function _EntraAdministrativeUnitRoleAssignmentAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['administrativeUnitId', 'administrativeUnitName'] });
-    this.optionSets.push({ options: ['roleDefinitionId', 'roleDefinitionName'] });
-    this.optionSets.push({ options: ['userId', 'userName'] });
-};
 export default new EntraAdministrativeUnitRoleAssignmentAddCommand();
 //# sourceMappingURL=administrativeunit-roleassignment-add.js.map

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

@@ -1,6 +1,10 @@
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+export const options = globalOptionsZod
+    .extend({})
+    .strict();
 class EntraMultitenantGetCommand extends GraphCommand {
     get name() {
         return commands.MULTITENANT_GET;
@@ -8,7 +12,10 @@ class EntraMultitenantGetCommand extends GraphCommand {
     get description() {
         return 'Gets properties of the multitenant organization';
     }
-    async commandAction(logger) {
+    get schema() {
+        return options;
+    }
+    async commandAction(logger, _args) {
         const requestOptions = {
             url: `${this.resource}/v1.0/tenantRelationships/multiTenantOrganization`,
             headers: {

package/dist/m365/entra/commands/multitenant/multitenant-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 _EntraMultitenantRemoveCommand_instances, _EntraMultitenantRemoveCommand_initTelemetry, _EntraMultitenantRemoveCommand_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';
 import { odata } from '../../../../utils/odata.js';
 import { cli } from '../../../../cli/cli.js';
+export const options = globalOptionsZod
+    .extend({
+    force: z.boolean().optional().alias('f')
+}).strict();
 class EntraMultitenantRemoveCommand extends GraphCommand {
     get name() {
         return commands.MULTITENANT_REMOVE;
@@ -16,11 +16,8 @@ class EntraMultitenantRemoveCommand extends GraphCommand {
     get description() {
         return 'Removes a multitenant organization';
     }
-    constructor() {
-        super();
-        _EntraMultitenantRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraMultitenantRemoveCommand_instances, "m", _EntraMultitenantRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraMultitenantRemoveCommand_instances, "m", _EntraMultitenantRemoveCommand_initOptions).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         const removeMultitenantOrg = async () => {
@@ -103,16 +100,5 @@ class EntraMultitenantRemoveCommand extends GraphCommand {
         await request.delete(requestOptions);
     }
 }
-_EntraMultitenantRemoveCommand_instances = new WeakSet(), _EntraMultitenantRemoveCommand_initTelemetry = function _EntraMultitenantRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            force: !!args.options.force
-        });
-    });
-}, _EntraMultitenantRemoveCommand_initOptions = function _EntraMultitenantRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-f, --force'
-    });
-};
 export default new EntraMultitenantRemoveCommand();
 //# sourceMappingURL=multitenant-remove.js.map