@pnp/cli-microsoft365 11.9.0-beta.69c1186 → 11.9.0-beta.87e70e2

package/dist/m365/commands/login.js

@@ -33,7 +33,7 @@ class LoginCommand extends Command {
         return commands.LOGIN;
     }
     get description() {
-        return 'Log in to Microsoft 365';
+        return 'Logs in to Microsoft 365';
     }
     get schema() {
         return options;

package/dist/m365/commands/logout.js

@@ -7,7 +7,7 @@ class LogoutCommand extends Command {
         return commands.LOGOUT;
     }
     get description() {
-        return 'Log out from Microsoft 365';
+        return 'Logs out from Microsoft 365';
     }
     get schema() {
         return options;

package/dist/m365/commands/request.js

@@ -1,15 +1,19 @@
-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 _RequestCommand_instances, _RequestCommand_initTelemetry, _RequestCommand_initOptions, _RequestCommand_initValidators;
 import fs from 'fs';
 import path from 'path';
+import { z } from 'zod';
 import auth from '../../Auth.js';
-import Command from '../../Command.js';
+import Command, { globalOptionsZod } from '../../Command.js';
 import request from '../../request.js';
 import commands from './commands.js';
+const allowedMethods = ['get', 'post', 'put', 'patch', 'delete', 'head', 'options'];
+export const options = z.looseObject({
+    ...globalOptionsZod.shape,
+    url: z.string().alias('u'),
+    method: z.enum(allowedMethods).default('get').alias('m'),
+    resource: z.string().optional().alias('r'),
+    body: z.string().optional().alias('b'),
+    filePath: z.string().optional().alias('p')
+});
 class RequestCommand extends Command {
     get name() {
         return commands.REQUEST;
@@ -17,16 +21,20 @@ class RequestCommand extends Command {
     get description() {
         return 'Executes the specified web request using CLI for Microsoft 365';
     }
-    allowUnknownOptions() {
-        return true;
+    get schema() {
+        return options;
     }
-    constructor() {
-        super();
-        _RequestCommand_instances.add(this);
-        this.allowedMethods = ['get', 'post', 'put', 'patch', 'delete', 'head', 'options'];
-        __classPrivateFieldGet(this, _RequestCommand_instances, "m", _RequestCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _RequestCommand_instances, "m", _RequestCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _RequestCommand_instances, "m", _RequestCommand_initValidators).call(this);
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => !opts.body || (opts.method !== 'get'), {
+            error: 'Specify a different method when using body'
+        })
+            .refine(opts => !opts.body || opts['content-type'], {
+            error: 'Specify the content-type when using body'
+        })
+            .refine(opts => !opts.filePath || fs.existsSync(path.dirname(opts.filePath)), {
+            error: 'The location specified in the filePath does not exist'
+        });
     }
     async commandAction(logger, args) {
         if (this.debug) {
@@ -34,9 +42,9 @@ class RequestCommand extends Command {
         }
         try {
             const url = this.resolveUrlTokens(args.options.url);
-            const method = (args.options.method || 'get').toUpperCase();
+            const method = args.options.method.toUpperCase();
             const headers = {};
-            this.addUnknownOptionsToPayload(headers, args.options);
+            this.addUnknownOptionsToPayloadZod(headers, args.options);
             if (!headers.accept) {
                 headers.accept = 'application/json';
             }
@@ -99,47 +107,5 @@ class RequestCommand extends Command {
         return url;
     }
 }
-_RequestCommand_instances = new WeakSet(), _RequestCommand_initTelemetry = function _RequestCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            method: args.options.method || 'get',
-            resource: typeof args.options.resource !== 'undefined',
-            accept: args.options.accept || 'application/json',
-            body: typeof args.options.body !== 'undefined',
-            filePath: typeof args.options.filePath !== 'undefined'
-        });
-        this.trackUnknownOptions(this.telemetryProperties, args.options);
-    });
-}, _RequestCommand_initOptions = function _RequestCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --url <url>'
-    }, {
-        option: '-m, --method [method]',
-        autocomplete: this.allowedMethods
-    }, {
-        option: '-r, --resource [resource]'
-    }, {
-        option: '-b, --body [body]'
-    }, {
-        option: '-p, --filePath [filePath]'
-    });
-}, _RequestCommand_initValidators = function _RequestCommand_initValidators() {
-    this.validators.push(async (args) => {
-        const currentMethod = args.options.method || 'get';
-        if (this.allowedMethods.indexOf(currentMethod) === -1) {
-            return `${currentMethod} is not a valid value for method. Allowed values: ${this.allowedMethods.join(', ')}`;
-        }
-        if (args.options.body && (!args.options.method || args.options.method === 'get')) {
-            return 'Specify a different method when using body';
-        }
-        if (args.options.body && !args.options['content-type']) {
-            return 'Specify the content-type when using body';
-        }
-        if (args.options.filePath && !fs.existsSync(path.dirname(args.options.filePath))) {
-            return 'The location specified in the filePath does not exist';
-        }
-        return true;
-    });
-};
 export default new RequestCommand();
 //# sourceMappingURL=request.js.map

package/dist/m365/commands/search.js

@@ -1,12 +1,36 @@
-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 _SearchCommand_instances, _SearchCommand_initTelemetry, _SearchCommand_initOptions, _SearchCommand_initValidators;
+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';
+const allowedScopes = ['chatMessage', 'message', 'event', 'drive', 'driveItem', 'list', 'listItem', 'site', 'bookmark', 'acronym', 'person'];
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    queryText: z.string().optional().alias('q'),
+    scopes: z.string()
+        .refine(value => value.split(',').map(x => x.trim()).every(scope => allowedScopes.includes(scope)), {
+        error: e => {
+            const scopes = e.input.split(',').map(x => x.trim());
+            const invalidScope = scopes.find(scope => !allowedScopes.includes(scope));
+            return `'${invalidScope}' is not a valid scope. Allowed scopes are ${allowedScopes.join(', ')}.`;
+        }
+    }).alias('s'),
+    startIndex: z.number()
+        .refine(n => n >= 0, {
+        error: e => `'${e.input}' is not a valid value for option 'startIndex'. Start index must be greater or equal to 0.`
+    }).optional(),
+    pageSize: z.number()
+        .refine(n => n >= 1 && n <= 500, {
+        error: e => `'${e.input}' is not a valid value for option 'pageSize'. Page size must be between 1 and 500.`
+    }).optional(),
+    allResults: z.boolean().optional(),
+    resultsOnly: z.boolean().optional(),
+    enableTopResults: z.boolean().optional(),
+    select: z.string().optional(),
+    sortBy: z.string().optional(),
+    enableSpellingSuggestion: z.boolean().optional(),
+    enableSpellingModification: z.boolean().optional()
+});
 class SearchCommand extends GraphCommand {
     get name() {
         return commands.SEARCH;
@@ -14,13 +38,35 @@ class SearchCommand extends GraphCommand {
     get description() {
         return 'Uses the Microsoft Search to query Microsoft 365 data';
     }
-    constructor() {
-        super();
-        _SearchCommand_instances.add(this);
-        this.allowedScopes = ['chatMessage', 'message', 'event', 'drive', 'driveItem', 'list', 'listItem', 'site', 'bookmark', 'acronym', 'person'];
-        __classPrivateFieldGet(this, _SearchCommand_instances, "m", _SearchCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SearchCommand_instances, "m", _SearchCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SearchCommand_instances, "m", _SearchCommand_initValidators).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => {
+            if (opts.sortBy) {
+                const scopes = opts.scopes.split(',').map(x => x.trim());
+                return !scopes.some(scope => scope === 'message' || scope === 'event');
+            }
+            return true;
+        }, {
+            error: 'Sorting the results is not supported for messages and events.'
+        })
+            .refine(opts => {
+            if (opts.enableTopResults) {
+                const scopes = opts.scopes.split(',').map(x => x.trim());
+                if (scopes.length === 1) {
+                    return scopes[0] === 'message' || scopes[0] === 'chatMessage';
+                }
+                if (scopes.length === 2) {
+                    return scopes.includes('message') && scopes.includes('chatMessage');
+                }
+                return false;
+            }
+            return true;
+        }, {
+            error: 'Top results are only supported for messages and chat messages.'
+        });
     }
     async commandAction(logger, args) {
         let result;
@@ -108,69 +154,5 @@ class SearchCommand extends GraphCommand {
         return properties;
     }
 }
-_SearchCommand_instances = new WeakSet(), _SearchCommand_initTelemetry = function _SearchCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            queryText: typeof args.options.queryText !== 'undefined',
-            startIndex: typeof args.options.startIndex !== 'undefined',
-            pageSize: typeof args.options.pageSize !== 'undefined',
-            allResults: !!args.options.allResults,
-            resultsOnly: !!args.options.resultsOnly,
-            enableTopResults: !!args.options.enableTopResults,
-            select: typeof args.options.select !== 'undefined',
-            sortBy: typeof args.options.sortBy !== 'undefined',
-            enableSpellingSuggestion: !!args.options.enableSpellingSuggestion,
-            enableSpellingModification: !!args.options.enableSpellingModification
-        });
-    });
-}, _SearchCommand_initOptions = function _SearchCommand_initOptions() {
-    this.options.unshift({
-        option: '-q, --queryText [queryText]'
-    }, {
-        option: '-s, --scopes <scopes>',
-        autocomplete: this.allowedScopes
-    }, {
-        option: '--startIndex [startIndex]'
-    }, {
-        option: '--pageSize [pageSize]'
-    }, {
-        option: '--allResults'
-    }, {
-        option: '--resultsOnly'
-    }, {
-        option: '--enableTopResults'
-    }, {
-        option: '--select [select]'
-    }, {
-        option: '--sortBy [sortBy]'
-    }, {
-        option: '--enableSpellingSuggestion'
-    }, {
-        option: '--enableSpellingModification'
-    });
-}, _SearchCommand_initValidators = function _SearchCommand_initValidators() {
-    this.validators.push(async (args) => {
-        const scopes = args.options.scopes.split(',').map(x => x.trim());
-        if (!scopes.every(scope => this.allowedScopes.indexOf(scope) > -1)) {
-            const invalidScope = scopes.find(scope => this.allowedScopes.indexOf(scope) === -1);
-            return `'${invalidScope}'' is not a valid scope. Allowed scopes are ${this.allowedScopes.join(', ')}.`;
-        }
-        if (args.options.startIndex !== undefined && args.options.startIndex < 0) {
-            return `'${args.options.startIndex}' is not a valid value for option 'startIndex'. Start index must be greater or equal to 0.`;
-        }
-        if (args.options.pageSize !== undefined && (args.options.pageSize < 1 || args.options.pageSize > 500)) {
-            return `'${args.options.pageSize}' is not a valid value for option 'pageSize'. Page size must be between 1 and 500.`;
-        }
-        if (args.options.sortBy && scopes.some(scope => scope === 'message' || scope === 'event')) {
-            return 'Sorting the results is not supported for messages and events.';
-        }
-        if (args.options.enableTopResults &&
-            ((scopes.length === 1 && scopes.indexOf('message') === -1 && scopes.indexOf('chatMessage') === -1) ||
-                (scopes.length === 2) && !(scopes.indexOf('message') > -1 && scopes.indexOf('chatMessage') > -1))) {
-            return 'Top results are only supported for messages and chat messages.';
-        }
-        return true;
-    });
-};
 export default new SearchCommand();
 //# sourceMappingURL=search.js.map

package/dist/m365/commands/setup.js

@@ -1,13 +1,9 @@
-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 _SetupCommand_instances, _SetupCommand_initTelemetry, _SetupCommand_initOptions, _SetupCommand_initValidators;
 import chalk from 'chalk';
 import os from 'os';
+import { z } from 'zod';
 import auth, { AuthType } from '../../Auth.js';
 import { cli } from '../../cli/cli.js';
+import { globalOptionsZod } from '../../Command.js';
 import config from '../../config.js';
 import { settingsNames } from '../../settingsNames.js';
 import { accessToken } from '../../utils/accessToken.js';
@@ -18,6 +14,12 @@ import { validation } from '../../utils/validation.js';
 import AnonymousCommand from '../base/AnonymousCommand.js';
 import commands from './commands.js';
 import { interactivePreset, powerShellPreset, scriptingPreset } from './setupPresets.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    interactive: z.boolean().optional(),
+    scripting: z.boolean().optional(),
+    skipApp: z.boolean().optional()
+});
 export var CliUsageMode;
 (function (CliUsageMode) {
     CliUsageMode["Interactively"] = "interactively";
@@ -51,12 +53,14 @@ class SetupCommand extends AnonymousCommand {
     get description() {
         return 'Sets up CLI for Microsoft 365 based on your preferences';
     }
-    constructor() {
-        super();
-        _SetupCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SetupCommand_instances, "m", _SetupCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SetupCommand_instances, "m", _SetupCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SetupCommand_instances, "m", _SetupCommand_initValidators).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => !opts.interactive || !opts.scripting, {
+            error: 'Specify either interactive or scripting but not both'
+        });
     }
     async commandAction(logger, args) {
         let settings;
@@ -360,24 +364,5 @@ class SetupCommand extends AnonymousCommand {
         }
     }
 }
-_SetupCommand_instances = new WeakSet(), _SetupCommand_initTelemetry = function _SetupCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        const properties = {
-            interactive: !!args.options.interactive,
-            scripting: !!args.options.scripting,
-            skipApp: !!args.options.skipApp
-        };
-        Object.assign(this.telemetryProperties, properties);
-    });
-}, _SetupCommand_initOptions = function _SetupCommand_initOptions() {
-    this.options.unshift({ option: '--interactive' }, { option: '--scripting' }, { option: '--skipApp' });
-}, _SetupCommand_initValidators = function _SetupCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.interactive && args.options.scripting) {
-            return 'Specify either interactive or scripting but not both';
-        }
-        return true;
-    });
-};
 export default new SetupCommand();
 //# sourceMappingURL=setup.js.map

package/dist/m365/commands/version.js

@@ -1,6 +1,9 @@
+import { z } from 'zod';
+import { globalOptionsZod } from '../../Command.js';
 import { app } from '../../utils/app.js';
 import AnonymousCommand from '../base/AnonymousCommand.js';
 import commands from './commands.js';
+export const options = z.strictObject({ ...globalOptionsZod.shape });
 class VersionCommand extends AnonymousCommand {
     get name() {
         return commands.VERSION;
@@ -8,6 +11,9 @@ class VersionCommand extends AnonymousCommand {
     get description() {
         return 'Shows CLI for Microsoft 365 version';
     }
+    get schema() {
+        return options;
+    }
     async commandAction(logger) {
         await logger.log(`v${app.packageJson().version}`);
     }

package/dist/m365/connection/commands/connection-list.js

@@ -9,7 +9,7 @@ class ConnectionListCommand extends Command {
         return commands.LIST;
     }
     get description() {
-        return 'Show the list of available connections';
+        return 'Shows the list of available connections';
     }
     get schema() {
         return options;

package/dist/m365/connection/commands/connection-remove.js

@@ -13,7 +13,7 @@ class ConnectionRemoveCommand extends Command {
         return commands.REMOVE;
     }
     get description() {
-        return 'Remove the specified connection';
+        return 'Removes the specified connection';
     }
     get schema() {
         return options;

package/dist/m365/connection/commands/connection-set.js

@@ -18,7 +18,7 @@ class ConnectionSetCommand extends Command {
         return commands.SET;
     }
     get description() {
-        return 'Rename the specified connection';
+        return 'Renames the specified connection';
     }
     get schema() {
         return options;

package/dist/m365/connection/commands/connection-use.js

@@ -13,7 +13,7 @@ class ConnectionUseCommand extends Command {
         return commands.USE;
     }
     get description() {
-        return 'Activate the specified Microsoft 365 tenant connection';
+        return 'Activates the specified Microsoft 365 tenant connection';
     }
     get schema() {
         return options;

package/dist/m365/context/commands/option/option-list.js

@@ -9,7 +9,7 @@ class ContextOptionListCommand extends ContextCommand {
         return commands.OPTION_LIST;
     }
     get description() {
-        return 'List all options added to the context';
+        return 'Lists all options added to the context';
     }
     get schema() {
         return options;

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

@@ -1,31 +1,49 @@
-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;
     }
     get description() {
-        return 'Adds a member (user, group, device) to an administrative unit';
+        return 'Adds a member (user, group, or 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,28 +1,35 @@
-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;
     }
     get description() {
-        return 'Retrieve a specific member (user, group, or device) of an administrative unit';
+        return 'Retrieves info about a specific member 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