@pnp/cli-microsoft365 11.10.0-beta.fdeb2ae → 11.11.0-beta.1cb40cb

package/dist/Auth.js

@@ -361,7 +361,7 @@ export class Auth {
         if (response.message) {
             await logger.logToStderr(`🌶️  ${response.message}`);
         }
-        if (cli.getSettingWithDefaultValue(settingsNames.autoOpenLinksInBrowser, false)) {
+        if (cli.getSettingWithDefaultValue(settingsNames.autoOpenLinksInBrowser, false) && response.verificationUri !== undefined) {
             await browserUtil.open(response.verificationUri);
         }
         if (cli.getSettingWithDefaultValue(settingsNames.copyDeviceCodeToClipboard, false)) {
@@ -372,7 +372,9 @@ export class Auth {
             if (!this._clipboardy) {
                 this._clipboardy = (await import('clipboardy')).default;
             }
-            this._clipboardy.writeSync(response.userCode);
+            if (response.userCode !== undefined) {
+                this._clipboardy.writeSync(response.userCode);
+            }
         }
     }
     async ensureAccessTokenWithPassword(resource, logger, debug) {

package/dist/config.js

@@ -56,6 +56,7 @@ export default {
         'https://graph.microsoft.com/TeamSettings.ReadWrite.All',
         'https://graph.microsoft.com/TeamsTab.ReadWrite.All',
         'https://graph.microsoft.com/User.Invite.All',
+        'https://graph.microsoft.com/User.ReadBasic.All',
         'https://manage.office.com/ActivityFeed.Read',
         'https://manage.office.com/ServiceHealth.Read',
         'https://analysis.windows.net/powerbi/api/Dataset.Read.All',

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

@@ -0,0 +1,48 @@
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
+import { odata } from '../../../../utils/odata.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    properties: z.string().optional().alias('p')
+});
+class EntraAgentListCommand extends GraphCommand {
+    get name() {
+        return commands.AGENT_LIST;
+    }
+    get description() {
+        return 'Retrieves a list of agents';
+    }
+    get schema() {
+        return options;
+    }
+    defaultProperties() {
+        return ['id', 'displayName'];
+    }
+    async commandAction(logger, args) {
+        const queryParameters = [];
+        if (args.options.properties) {
+            const allProperties = args.options.properties
+                .split(',')
+                .map(prop => prop.replace(/['"]/g, '').trim())
+                .filter(prop => prop.length > 0);
+            const selectProperties = allProperties.filter(prop => !prop.includes('/'));
+            if (selectProperties.length > 0) {
+                queryParameters.push(`$select=${selectProperties}`);
+            }
+        }
+        const queryString = queryParameters.length > 0
+            ? `?${queryParameters.join('&')}`
+            : '';
+        try {
+            const results = await odata.getAllItems(`${this.resource}/v1.0/users/microsoft.graph.agentUser${queryString}`);
+            await logger.log(results);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+}
+export default new EntraAgentListCommand();
+//# sourceMappingURL=agent-list.js.map

package/dist/m365/entra/commands.js

@@ -9,6 +9,7 @@ export default {
     ADMINISTRATIVEUNIT_MEMBER_LIST: `${prefix} administrativeunit member list`,
     ADMINISTRATIVEUNIT_MEMBER_REMOVE: `${prefix} administrativeunit member remove`,
     ADMINISTRATIVEUNIT_ROLEASSIGNMENT_ADD: `${prefix} administrativeunit roleassignment add`,
+    AGENT_LIST: `${prefix} agent list`,
     APP_ADD: `${prefix} app add`,
     APP_GET: `${prefix} app get`,
     APP_LIST: `${prefix} app list`,

package/dist/m365/outlook/commands/event/event-get.js

@@ -0,0 +1,77 @@
+import { z } from 'zod';
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+import { validation } from '../../../../utils/validation.js';
+import { globalOptionsZod } from '../../../../Command.js';
+import request from '../../../../request.js';
+import { calendar } from '../../../../utils/calendar.js';
+import { formatting } from '../../../../utils/formatting.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    id: z.string().alias('i'),
+    userId: z.string().refine(id => validation.isValidGuid(id), {
+        error: e => `'${e.input}' is not a valid GUID.`
+    }).optional(),
+    userName: z.string().refine(name => validation.isValidUserPrincipalName(name), {
+        error: e => `'${e.input}' is not a valid UPN.`
+    }).optional(),
+    calendarId: z.string().optional(),
+    calendarName: z.string().optional(),
+    timeZone: z.string().optional()
+});
+class OutlookEventGetCommand extends GraphCommand {
+    get name() {
+        return commands.EVENT_GET;
+    }
+    get description() {
+        return `Retrieve an event from a specific calendar of a user`;
+    }
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => [options.userId, options.userName].filter(x => x !== undefined).length === 1, {
+            error: 'Specify either userId or userName, but not both'
+        })
+            .refine(options => !(options.calendarId && options.calendarName), {
+            error: 'Specify either calendarId or calendarName, but not both.'
+        });
+    }
+    async commandAction(logger, args) {
+        const userIdentifier = args.options.userId ?? args.options.userName;
+        if (this.verbose) {
+            await logger.logToStderr(`Retrieving event ${args.options.id} for user ${userIdentifier}...`);
+        }
+        let calendarId = args.options.calendarId;
+        if (args.options.calendarName) {
+            calendarId = (await calendar.getUserCalendarByName(userIdentifier, args.options.calendarName)).id;
+        }
+        let requestUrl = `${this.resource}/v1.0/users('${formatting.encodeQueryParameter(userIdentifier)}')`;
+        if (calendarId) {
+            requestUrl += `/calendars/${calendarId}/events/${args.options.id}`;
+        }
+        else {
+            requestUrl += `/events/${args.options.id}`;
+        }
+        const requestOptions = {
+            url: requestUrl,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        if (args.options.timeZone) {
+            requestOptions.headers.Prefer = `outlook.timezone="${args.options.timeZone}"`;
+        }
+        try {
+            const result = await request.get(requestOptions);
+            await logger.log(result);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+}
+export default new OutlookEventGetCommand();
+//# sourceMappingURL=event-get.js.map

package/dist/m365/outlook/commands.js

@@ -10,6 +10,7 @@ export default {
     CALENDARGROUP_REMOVE: `${prefix} calendargroup remove`,
     CALENDARGROUP_SET: `${prefix} calendargroup set`,
     EVENT_CANCEL: `${prefix} event cancel`,
+    EVENT_GET: `${prefix} event get`,
     EVENT_LIST: `${prefix} event list`,
     EVENT_REMOVE: `${prefix} event remove`,
     MAIL_SEARCHFOLDER_ADD: `${prefix} mail searchfolder add`,

package/dist/m365/pp/commands/aibuildermodel/aibuildermodel-get.js

@@ -1,16 +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 _PpAiBuilderModelGetCommand_instances, _PpAiBuilderModelGetCommand_initTelemetry, _PpAiBuilderModelGetCommand_initOptions, _PpAiBuilderModelGetCommand_initOptionSets, _PpAiBuilderModelGetCommand_initValidators;
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { powerPlatform } from '../../../../utils/powerPlatform.js';
 import { validation } from '../../../../utils/validation.js';
 import PowerPlatformCommand from '../../../base/PowerPlatformCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    environmentName: z.string().alias('e'),
+    id: z.string().refine(val => validation.isValidGuid(val), {
+        error: 'The value must be a valid GUID.'
+    }).optional().alias('i'),
+    name: z.string().optional().alias('n'),
+    asAdmin: z.boolean().optional()
+});
 class PpAiBuilderModelGetCommand extends PowerPlatformCommand {
     get name() {
         return commands.AIBUILDERMODEL_GET;
@@ -18,13 +23,18 @@ class PpAiBuilderModelGetCommand extends PowerPlatformCommand {
     get description() {
         return 'Gets a specific AI builder model in the specified Power Platform environment';
     }
-    constructor() {
-        super();
-        _PpAiBuilderModelGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _PpAiBuilderModelGetCommand_instances, "m", _PpAiBuilderModelGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _PpAiBuilderModelGetCommand_instances, "m", _PpAiBuilderModelGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _PpAiBuilderModelGetCommand_instances, "m", _PpAiBuilderModelGetCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _PpAiBuilderModelGetCommand_instances, "m", _PpAiBuilderModelGetCommand_initValidators).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.id, opts.name].filter(x => x !== undefined).length === 1, {
+            error: `Specify either 'id' or 'name', but not both.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'name']
+            }
+        });
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -63,33 +73,5 @@ class PpAiBuilderModelGetCommand extends PowerPlatformCommand {
         return result.value[0];
     }
 }
-_PpAiBuilderModelGetCommand_instances = new WeakSet(), _PpAiBuilderModelGetCommand_initTelemetry = function _PpAiBuilderModelGetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            id: typeof args.options.id !== 'undefined',
-            name: typeof args.options.name !== 'undefined',
-            asAdmin: !!args.options.asAdmin
-        });
-    });
-}, _PpAiBuilderModelGetCommand_initOptions = function _PpAiBuilderModelGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-e, --environmentName <environmentName>'
-    }, {
-        option: '-i, --id [id]'
-    }, {
-        option: '-n, --name [name]'
-    }, {
-        option: '--asAdmin'
-    });
-}, _PpAiBuilderModelGetCommand_initOptionSets = function _PpAiBuilderModelGetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'name'] });
-}, _PpAiBuilderModelGetCommand_initValidators = function _PpAiBuilderModelGetCommand_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 PpAiBuilderModelGetCommand();
 //# sourceMappingURL=aibuildermodel-get.js.map

package/dist/m365/pp/commands/aibuildermodel/aibuildermodel-list.js

@@ -1,13 +1,14 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _PpAiBuilderModelListCommand_instances, _PpAiBuilderModelListCommand_initTelemetry, _PpAiBuilderModelListCommand_initOptions;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { odata } from '../../../../utils/odata.js';
 import { powerPlatform } from '../../../../utils/powerPlatform.js';
 import PowerPlatformCommand from '../../../base/PowerPlatformCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    environmentName: z.string().alias('e'),
+    asAdmin: z.boolean().optional()
+});
 class PpAiBuilderModelListCommand extends PowerPlatformCommand {
     get name() {
         return commands.AIBUILDERMODEL_LIST;
@@ -18,11 +19,8 @@ class PpAiBuilderModelListCommand extends PowerPlatformCommand {
     defaultProperties() {
         return ['msdyn_name', 'msdyn_aimodelid', 'createdon', 'modifiedon'];
     }
-    constructor() {
-        super();
-        _PpAiBuilderModelListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _PpAiBuilderModelListCommand_instances, "m", _PpAiBuilderModelListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _PpAiBuilderModelListCommand_instances, "m", _PpAiBuilderModelListCommand_initOptions).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -38,18 +36,5 @@ class PpAiBuilderModelListCommand extends PowerPlatformCommand {
         }
     }
 }
-_PpAiBuilderModelListCommand_instances = new WeakSet(), _PpAiBuilderModelListCommand_initTelemetry = function _PpAiBuilderModelListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            asAdmin: !!args.options.asAdmin
-        });
-    });
-}, _PpAiBuilderModelListCommand_initOptions = function _PpAiBuilderModelListCommand_initOptions() {
-    this.options.unshift({
-        option: '-e, --environmentName <environmentName>'
-    }, {
-        option: '--asAdmin'
-    });
-};
 export default new PpAiBuilderModelListCommand();
 //# sourceMappingURL=aibuildermodel-list.js.map

package/dist/m365/pp/commands/aibuildermodel/aibuildermodel-remove.js

@@ -1,16 +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 _PpAiBuilderModelRemoveCommand_instances, _PpAiBuilderModelRemoveCommand_initTelemetry, _PpAiBuilderModelRemoveCommand_initOptions, _PpAiBuilderModelRemoveCommand_initOptionSets, _PpAiBuilderModelRemoveCommand_initValidators;
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { powerPlatform } from '../../../../utils/powerPlatform.js';
 import { validation } from '../../../../utils/validation.js';
 import PowerPlatformCommand from '../../../base/PowerPlatformCommand.js';
 import commands from '../../commands.js';
 import ppAiBuilderModelGetCommand from './aibuildermodel-get.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    environmentName: z.string().alias('e'),
+    id: z.string().refine(val => validation.isValidGuid(val), {
+        error: 'The value must be a valid GUID.'
+    }).optional().alias('i'),
+    name: z.string().optional().alias('n'),
+    asAdmin: z.boolean().optional(),
+    force: z.boolean().optional().alias('f')
+});
 class PpAiBuilderModelRemoveCommand extends PowerPlatformCommand {
     get name() {
         return commands.AIBUILDERMODEL_REMOVE;
@@ -18,13 +24,18 @@ class PpAiBuilderModelRemoveCommand extends PowerPlatformCommand {
     get description() {
         return 'Removes an AI builder model in the specified Power Platform environment.';
     }
-    constructor() {
-        super();
-        _PpAiBuilderModelRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _PpAiBuilderModelRemoveCommand_instances, "m", _PpAiBuilderModelRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _PpAiBuilderModelRemoveCommand_instances, "m", _PpAiBuilderModelRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _PpAiBuilderModelRemoveCommand_instances, "m", _PpAiBuilderModelRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _PpAiBuilderModelRemoveCommand_instances, "m", _PpAiBuilderModelRemoveCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.id, opts.name].filter(x => x !== undefined).length === 1, {
+            error: `Specify either 'id' or 'name', but not both.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'name']
+            }
+        });
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -73,36 +84,5 @@ class PpAiBuilderModelRemoveCommand extends PowerPlatformCommand {
         }
     }
 }
-_PpAiBuilderModelRemoveCommand_instances = new WeakSet(), _PpAiBuilderModelRemoveCommand_initTelemetry = function _PpAiBuilderModelRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            id: typeof args.options.id !== 'undefined',
-            name: typeof args.options.name !== 'undefined',
-            asAdmin: !!args.options.asAdmin,
-            force: !!args.options.force
-        });
-    });
-}, _PpAiBuilderModelRemoveCommand_initOptions = function _PpAiBuilderModelRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-e, --environmentName <environmentName>'
-    }, {
-        option: '-i, --id [id]'
-    }, {
-        option: '-n, --name [name]'
-    }, {
-        option: '--asAdmin'
-    }, {
-        option: '-f, --force'
-    });
-}, _PpAiBuilderModelRemoveCommand_initOptionSets = function _PpAiBuilderModelRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'name'] });
-}, _PpAiBuilderModelRemoveCommand_initValidators = function _PpAiBuilderModelRemoveCommand_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 PpAiBuilderModelRemoveCommand();
 //# sourceMappingURL=aibuildermodel-remove.js.map

package/dist/m365/pp/commands/copilot/copilot-get.js

@@ -1,9 +1,5 @@
-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 _PpCopilotGetCommand_instances, _PpCopilotGetCommand_initTelemetry, _PpCopilotGetCommand_initOptions, _PpCopilotGetCommand_initOptionSets, _PpCopilotGetCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { powerPlatform } from '../../../../utils/powerPlatform.js';
@@ -11,6 +7,15 @@ import { validation } from '../../../../utils/validation.js';
 import PowerPlatformCommand from '../../../base/PowerPlatformCommand.js';
 import commands from '../../commands.js';
 import { cli } from '../../../../cli/cli.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    environmentName: z.string().alias('e'),
+    id: z.string().refine(val => validation.isValidGuid(val), {
+        error: 'The value must be a valid GUID.'
+    }).optional().alias('i'),
+    name: z.string().optional().alias('n'),
+    asAdmin: z.boolean().optional()
+});
 class PpCopilotGetCommand extends PowerPlatformCommand {
     get name() {
         return commands.COPILOT_GET;
@@ -18,13 +23,18 @@ class PpCopilotGetCommand extends PowerPlatformCommand {
     get description() {
         return 'Gets information about the specified copilot';
     }
-    constructor() {
-        super();
-        _PpCopilotGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _PpCopilotGetCommand_instances, "m", _PpCopilotGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _PpCopilotGetCommand_instances, "m", _PpCopilotGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _PpCopilotGetCommand_instances, "m", _PpCopilotGetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _PpCopilotGetCommand_instances, "m", _PpCopilotGetCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.id, opts.name].filter(x => x !== undefined).length === 1, {
+            error: `Specify either 'id' or 'name', but not both.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'name']
+            }
+        });
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -63,33 +73,5 @@ class PpCopilotGetCommand extends PowerPlatformCommand {
         return result.value[0];
     }
 }
-_PpCopilotGetCommand_instances = new WeakSet(), _PpCopilotGetCommand_initTelemetry = function _PpCopilotGetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            id: typeof args.options.id !== 'undefined',
-            name: typeof args.options.name !== 'undefined',
-            asAdmin: !!args.options.asAdmin
-        });
-    });
-}, _PpCopilotGetCommand_initOptions = function _PpCopilotGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-e, --environmentName <environmentName>'
-    }, {
-        option: '-i, --id [id]'
-    }, {
-        option: '-n, --name [name]'
-    }, {
-        option: '--asAdmin'
-    });
-}, _PpCopilotGetCommand_initOptionSets = function _PpCopilotGetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'name'] });
-}, _PpCopilotGetCommand_initValidators = function _PpCopilotGetCommand_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 PpCopilotGetCommand();
 //# sourceMappingURL=copilot-get.js.map

package/dist/m365/pp/commands/copilot/copilot-list.js

@@ -1,13 +1,14 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _PpCopilotListCommand_instances, _PpCopilotListCommand_initTelemetry, _PpCopilotListCommand_initOptions;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { odata } from '../../../../utils/odata.js';
 import { powerPlatform } from '../../../../utils/powerPlatform.js';
 import PowerPlatformCommand from '../../../base/PowerPlatformCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    environmentName: z.string().alias('e'),
+    asAdmin: z.boolean().optional()
+});
 class PpCopilotListCommand extends PowerPlatformCommand {
     get name() {
         return commands.COPILOT_LIST;
@@ -18,11 +19,8 @@ class PpCopilotListCommand extends PowerPlatformCommand {
     defaultProperties() {
         return ['name', 'botid', 'publishedOn', 'createdOn', 'botModifiedOn'];
     }
-    constructor() {
-        super();
-        _PpCopilotListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _PpCopilotListCommand_instances, "m", _PpCopilotListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _PpCopilotListCommand_instances, "m", _PpCopilotListCommand_initOptions).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -78,18 +76,5 @@ class PpCopilotListCommand extends PowerPlatformCommand {
         }
     }
 }
-_PpCopilotListCommand_instances = new WeakSet(), _PpCopilotListCommand_initTelemetry = function _PpCopilotListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            asAdmin: !!args.options.asAdmin
-        });
-    });
-}, _PpCopilotListCommand_initOptions = function _PpCopilotListCommand_initOptions() {
-    this.options.unshift({
-        option: '-e, --environmentName <environmentName>'
-    }, {
-        option: '--asAdmin'
-    });
-};
 export default new PpCopilotListCommand();
 //# sourceMappingURL=copilot-list.js.map

package/dist/m365/pp/commands/copilot/copilot-remove.js

@@ -1,16 +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 _PpCopilotRemoveCommand_instances, _PpCopilotRemoveCommand_initTelemetry, _PpCopilotRemoveCommand_initOptions, _PpCopilotRemoveCommand_initOptionSets, _PpCopilotRemoveCommand_initValidators;
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { powerPlatform } from '../../../../utils/powerPlatform.js';
 import { validation } from '../../../../utils/validation.js';
 import PowerPlatformCommand from '../../../base/PowerPlatformCommand.js';
 import commands from '../../commands.js';
 import ppCopilotGetCommand from './copilot-get.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    environmentName: z.string().alias('e'),
+    id: z.string().refine(val => validation.isValidGuid(val), {
+        error: 'The value must be a valid GUID.'
+    }).optional().alias('i'),
+    name: z.string().optional().alias('n'),
+    asAdmin: z.boolean().optional(),
+    force: z.boolean().optional().alias('f')
+});
 class PpCopilotRemoveCommand extends PowerPlatformCommand {
     get name() {
         return commands.COPILOT_REMOVE;
@@ -18,13 +24,18 @@ class PpCopilotRemoveCommand extends PowerPlatformCommand {
     get description() {
         return 'Removes the specified copilot';
     }
-    constructor() {
-        super();
-        _PpCopilotRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _PpCopilotRemoveCommand_instances, "m", _PpCopilotRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _PpCopilotRemoveCommand_instances, "m", _PpCopilotRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _PpCopilotRemoveCommand_instances, "m", _PpCopilotRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _PpCopilotRemoveCommand_instances, "m", _PpCopilotRemoveCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.id, opts.name].filter(x => x !== undefined).length === 1, {
+            error: `Specify either 'id' or 'name', but not both.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'name']
+            }
+        });
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -74,36 +85,5 @@ class PpCopilotRemoveCommand extends PowerPlatformCommand {
         }
     }
 }
-_PpCopilotRemoveCommand_instances = new WeakSet(), _PpCopilotRemoveCommand_initTelemetry = function _PpCopilotRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            id: typeof args.options.id !== 'undefined',
-            name: typeof args.options.name !== 'undefined',
-            asAdmin: !!args.options.asAdmin,
-            force: !!args.options.force
-        });
-    });
-}, _PpCopilotRemoveCommand_initOptions = function _PpCopilotRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-e, --environmentName <environmentName>'
-    }, {
-        option: '-i, --id [id]'
-    }, {
-        option: '-n, --name [name]'
-    }, {
-        option: '--asAdmin'
-    }, {
-        option: '-f, --force'
-    });
-}, _PpCopilotRemoveCommand_initOptionSets = function _PpCopilotRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'name'] });
-}, _PpCopilotRemoveCommand_initValidators = function _PpCopilotRemoveCommand_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 PpCopilotRemoveCommand();
 //# sourceMappingURL=copilot-remove.js.map