@pnp/cli-microsoft365 11.0.0-beta.4be9237 → 11.0.0-beta.677f8d3

package/dist/m365/entra/commands/app/app-add.js

@@ -425,7 +425,9 @@ _a = EntraAppAddCommand, _EntraAppAddCommand_instances = new WeakSet(), _EntraAp
             certificateBase64Encoded: typeof args.options.certificateBase64Encoded !== 'undefined',
             certificateDisplayName: typeof args.options.certificateDisplayName !== 'undefined',
             grantAdminConsent: typeof args.options.grantAdminConsent !== 'undefined',
-            allowPublicClientFlows: typeof args.options.allowPublicClientFlows !== 'undefined'
+            allowPublicClientFlows: typeof args.options.allowPublicClientFlows !== 'undefined',
+            bundleId: typeof args.options.bundleId !== 'undefined',
+            signatureHash: typeof args.options.signatureHash !== 'undefined'
         });
     });
 }, _EntraAppAddCommand_initOptions = function _EntraAppAddCommand_initOptions() {
@@ -465,6 +467,10 @@ _a = EntraAppAddCommand, _EntraAppAddCommand_instances = new WeakSet(), _EntraAp
         option: '--certificateDisplayName [certificateDisplayName]'
     }, {
         option: '--manifest [manifest]'
+    }, {
+        option: '--bundleId [bundleId]'
+    }, {
+        option: '--signatureHash [signatureHash]'
     }, {
         option: '--save'
     }, {
@@ -519,12 +525,18 @@ _a = EntraAppAddCommand, _EntraAppAddCommand_instances = new WeakSet(), _EntraAp
                 return `Error while parsing the specified manifest: ${e}`;
             }
         }
+        if (args.options.platform === 'apple' && !args.options.bundleId) {
+            return `When you use platform apple, you'll need to specify bundleId`;
+        }
+        if (args.options.platform === 'android' && (!args.options.bundleId || !args.options.signatureHash)) {
+            return `When you use platform android, you'll need to specify bundleId and signatureHash`;
+        }
         return true;
     });
 }, _EntraAppAddCommand_initOptionSets = function _EntraAppAddCommand_initOptionSets() {
     this.optionSets.push({ options: ['name', 'manifest'] });
 };
-EntraAppAddCommand.entraApplicationPlatform = ['spa', 'web', 'publicClient'];
+EntraAppAddCommand.entraApplicationPlatform = ['spa', 'web', 'publicClient', 'apple', 'android'];
 EntraAppAddCommand.entraAppScopeConsentBy = ['admins', 'adminsAndUsers'];
 export default new EntraAppAddCommand();
 //# sourceMappingURL=app-add.js.map

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

@@ -0,0 +1,146 @@
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+import request from '../../../../request.js';
+import { validation } from '../../../../utils/validation.js';
+import { entraAdministrativeUnit } from '../../../../utils/entraAdministrativeUnit.js';
+import { entraApp } from '../../../../utils/entraApp.js';
+import { entraServicePrincipal } from '../../../../utils/entraServicePrincipal.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
+import { roleDefinition } from '../../../../utils/roleDefinition.js';
+import { entraUser } from '../../../../utils/entraUser.js';
+const options = globalOptionsZod
+    .extend({
+    roleDefinitionId: z.string().refine(id => validation.isValidGuid(id), id => ({
+        message: `'${id}' is not a valid GUID.`
+    })).optional(),
+    roleDefinitionName: z.string().optional(),
+    principal: z.string().refine(principal => validation.isValidGuid(principal) || validation.isValidUserPrincipalName(principal) || validation.isValidMailNickname(principal), principal => ({
+        message: `'${principal}' is not a valid GUID, UPN or group mail nickname.`
+    })),
+    userId: z.string().refine(id => validation.isValidGuid(id), id => ({
+        message: `'${id}' is not a valid GUID.`
+    })).optional(),
+    userName: z.string().refine(upn => validation.isValidUserPrincipalName(upn), upn => ({
+        message: `'${upn}' is not a valid UPN.`
+    })).optional(),
+    administrativeUnitId: z.string().refine(id => validation.isValidGuid(id), id => ({
+        message: `'${id}' is not a valid GUID.`
+    })).optional(),
+    administrativeUnitName: z.string().optional(),
+    applicationId: z.string().refine(id => validation.isValidGuid(id), id => ({
+        message: `'${id}' is not a valid GUID.`
+    })).optional(),
+    applicationObjectId: z.string().refine(id => validation.isValidGuid(id), id => ({
+        message: `'${id}' is not a valid GUID.`
+    })).optional(),
+    applicationName: z.string().optional(),
+    servicePrincipalId: z.string().refine(id => validation.isValidGuid(id), id => ({
+        message: `'${id}' is not a valid GUID.`
+    })).optional(),
+    servicePrincipalName: z.string().optional(),
+    groupId: z.string().refine(id => validation.isValidGuid(id), id => ({
+        message: `'${id}' is not a valid GUID.`
+    })).optional(),
+    groupName: z.string().optional()
+})
+    .strict();
+class EntraRoleAssignmentAddCommand extends GraphCommand {
+    get name() {
+        return commands.ROLEASSIGNMENT_ADD;
+    }
+    get description() {
+        return 'Assign a Entra ID role to a user and specify the scope for which the user has been granted access';
+    }
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => [options.roleDefinitionId, options.roleDefinitionName].filter(o => o !== undefined).length === 1, {
+            message: 'Specify either roleDefinitionId or roleDefinitionName'
+        })
+            .refine(options => Object.values([options.userId, options.userName, options.administrativeUnitId, options.administrativeUnitName, options.applicationId, options.applicationObjectId, options.applicationName,
+            options.servicePrincipalId, options.servicePrincipalName, options.groupId, options.groupName]).filter(v => typeof v !== 'undefined').length < 2, {
+            message: 'Provide value for only one of the following parameters: userId, userName, administrativeUnitId, administrativeUnitName, applicationId, applicationObjectId, applicationName, servicePrincipalId, servicePrincipalName, groupId or groupName'
+        });
+    }
+    async commandAction(logger, args) {
+        try {
+            const roleDefinitionId = await this.getRoleDefinitionId(args.options, logger);
+            const data = {
+                roleDefinitionId: roleDefinitionId,
+                principalId: await this.getPrincipalId(args.options, logger),
+                directoryScopeId: await this.getDirectoryScopeId(args.options)
+            };
+            const requestOptions = {
+                url: `${this.resource}/v1.0/roleManagement/directory/roleAssignments`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json',
+                data: data
+            };
+            const response = await request.post(requestOptions);
+            await logger.log(response);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+    async getRoleDefinitionId(options, logger) {
+        if (options.roleDefinitionId) {
+            return options.roleDefinitionId;
+        }
+        if (this.verbose) {
+            await logger.logToStderr(`Retrieving role definition by its name '${options.roleDefinitionName}'`);
+        }
+        const role = await roleDefinition.getRoleDefinitionByDisplayName(options.roleDefinitionName);
+        return role.id;
+    }
+    async getPrincipalId(options, logger) {
+        if (validation.isValidGuid(options.principal)) {
+            return options.principal;
+        }
+        if (validation.isValidUserPrincipalName(options.principal)) {
+            if (this.verbose) {
+                await logger.logToStderr(`Retrieving user id by UPN '${options.principal}'`);
+            }
+            return await entraUser.getUserIdByUpn(options.principal);
+        }
+        if (this.verbose) {
+            await logger.logToStderr(`Retrieving group id by mail nickname '${options.principal}'`);
+        }
+        return await entraGroup.getGroupIdByMailNickname(options.principal);
+    }
+    async getDirectoryScopeId(options) {
+        let prefix = '/';
+        let resourceId = '';
+        if (options.userId || options.userName) {
+            resourceId = options.userId || await entraUser.getUserIdByUpn(options.userName);
+        }
+        else if (options.administrativeUnitId || options.administrativeUnitName) {
+            prefix = '/administrativeUnits/';
+            resourceId = options.administrativeUnitId || (await entraAdministrativeUnit.getAdministrativeUnitByDisplayName(options.administrativeUnitName, "id")).id;
+        }
+        else if (options.applicationId || options.applicationObjectId || options.applicationName) {
+            resourceId = options.applicationObjectId;
+            if (options.applicationId) {
+                resourceId = (await entraApp.getAppRegistrationByAppId(options.applicationId, ["id"])).id;
+            }
+            else if (options.applicationName) {
+                resourceId = (await entraApp.getAppRegistrationByAppName(options.applicationName, ["id"])).id;
+            }
+        }
+        else if (options.servicePrincipalId || options.servicePrincipalName) {
+            resourceId = options.servicePrincipalId || (await entraServicePrincipal.getServicePrincipalByAppName(options.servicePrincipalName, "id")).id;
+        }
+        else if (options.groupId || options.groupName) {
+            resourceId = options.groupId || (await entraGroup.getGroupIdByDisplayName(options.groupName));
+        }
+        return `${prefix}${resourceId}`;
+    }
+}
+export default new EntraRoleAssignmentAddCommand();
+//# sourceMappingURL=roleassignment-add.js.map

package/dist/m365/entra/commands.js

@@ -92,6 +92,7 @@ export default {
     PIM_ROLE_REQUEST_LIST: `${prefix} pim role request list`,
     POLICY_LIST: `${prefix} policy list`,
     RESOURCENAMESPACE_LIST: `${prefix} resourcenamespace list`,
+    ROLEASSIGNMENT_ADD: `${prefix} roleassignment add`,
     ROLEDEFINITION_ADD: `${prefix} roledefinition add`,
     ROLEDEFINITION_LIST: `${prefix} roledefinition list`,
     ROLEDEFINITION_GET: `${prefix} roledefinition get`,

package/dist/m365/flow/commands/environment/environment-get.js

@@ -1,13 +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 _FlowEnvironmentGetCommand_instances, _FlowEnvironmentGetCommand_initOptions, _FlowEnvironmentGetCommand_initTelemetry;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
+import { zod } from '../../../../utils/zod.js';
 import PowerAutomateCommand from '../../../base/PowerAutomateCommand.js';
 import commands from '../../commands.js';
+const options = globalOptionsZod
+    .extend({
+    name: zod.alias('n', z.string().optional()),
+    default: z.boolean().optional()
+})
+    .strict();
 class FlowEnvironmentGetCommand extends PowerAutomateCommand {
     get name() {
         return commands.ENVIRONMENT_GET;
@@ -15,23 +18,21 @@ class FlowEnvironmentGetCommand extends PowerAutomateCommand {
     get description() {
         return 'Gets information about the specified Microsoft Flow environment';
     }
-    constructor() {
-        super();
-        _FlowEnvironmentGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _FlowEnvironmentGetCommand_instances, "m", _FlowEnvironmentGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _FlowEnvironmentGetCommand_instances, "m", _FlowEnvironmentGetCommand_initTelemetry).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => !!options.name !== !!options.default, {
+            message: `Specify either name or default, but not both.`
+        });
     }
     async commandAction(logger, args) {
         if (this.verbose) {
-            await logger.logToStderr(`Retrieving information about Microsoft Flow environment ${args.options.name ?? ''}...`);
+            await logger.logToStderr(`Retrieving information about Microsoft Flow environment ${args.options.name ?? 'default'}...`);
         }
         let requestUrl = `${PowerAutomateCommand.resource}/providers/Microsoft.ProcessSimple/environments/`;
-        if (args.options.name) {
-            requestUrl += `${formatting.encodeQueryParameter(args.options.name)}`;
-        }
-        else {
-            requestUrl += `~default`;
-        }
+        requestUrl += args.options.default ? '~default' : formatting.encodeQueryParameter(args.options.name);
         const requestOptions = {
             url: `${requestUrl}?api-version=2016-11-01`,
             headers: {
@@ -55,16 +56,5 @@ class FlowEnvironmentGetCommand extends PowerAutomateCommand {
         }
     }
 }
-_FlowEnvironmentGetCommand_instances = new WeakSet(), _FlowEnvironmentGetCommand_initOptions = function _FlowEnvironmentGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-n, --name [name]'
-    });
-}, _FlowEnvironmentGetCommand_initTelemetry = function _FlowEnvironmentGetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            name: typeof args.options.name !== 'undefined'
-        });
-    });
-};
 export default new FlowEnvironmentGetCommand();
 //# sourceMappingURL=environment-get.js.map

package/dist/m365/outlook/commands/mail/mail-searchfolder-add.js

@@ -0,0 +1,85 @@
+import request from '../../../../request.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
+import { zod } from '../../../../utils/zod.js';
+import { validation } from '../../../../utils/validation.js';
+import { accessToken } from '../../../../utils/accessToken.js';
+import auth from '../../../../Auth.js';
+const options = globalOptionsZod
+    .extend({
+    userId: zod.alias('i', z.string()
+        .refine(userId => validation.isValidGuid(userId), userId => ({
+        message: `'${userId}' is not a valid GUID.`
+    })).optional()),
+    userName: zod.alias('n', z.string()
+        .refine(userName => validation.isValidUserPrincipalName(userName), userName => ({
+        message: `'${userName}' is not a valid UPN.`
+    })).optional()),
+    folderName: z.string(),
+    messageFilter: z.string(),
+    sourceFoldersIds: z.string().transform((value) => value.split(',')).pipe(z.string().array()),
+    includeNestedFolders: z.boolean().optional()
+})
+    .strict();
+class OutlookMailSearchFolderAddCommand extends GraphCommand {
+    get name() {
+        return commands.MAIL_SEARCHFOLDER_ADD;
+    }
+    get description() {
+        return `Creates a new mail search folder in the user's mailbox`;
+    }
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => !(options.userId && options.userName), {
+            message: 'Specify either userId or userName, but not both'
+        });
+    }
+    async commandAction(logger, args) {
+        try {
+            const isAppOnlyAccessToken = accessToken.isAppOnlyAccessToken(auth.connection.accessTokens[auth.defaultResource].accessToken);
+            let requestUrl = `${this.resource}/v1.0/me/mailFolders/searchFolders/childFolders`;
+            if (isAppOnlyAccessToken) {
+                if (!args.options.userId && !args.options.userName) {
+                    throw 'When running with application permissions either userId or userName is required';
+                }
+                const userIdentifier = args.options.userId ?? args.options.userName;
+                requestUrl = `${this.resource}/v1.0/users('${userIdentifier}')/mailFolders/searchFolders/childFolders`;
+                if (args.options.verbose) {
+                    await logger.logToStderr(`Creating a mail search folder in the mailbox of the user ${userIdentifier}...`);
+                }
+            }
+            else {
+                if (args.options.userId || args.options.userName) {
+                    throw 'You can create mail search folder for other users only if CLI is authenticated in app-only mode';
+                }
+            }
+            const requestOptions = {
+                url: requestUrl,
+                headers: {
+                    accept: 'application/json;odata.metadata=none',
+                    'content-type': 'application/json'
+                },
+                responseType: 'json',
+                data: {
+                    '@odata.type': '#microsoft.graph.mailSearchFolder',
+                    displayName: args.options.folderName,
+                    includeNestedFolders: args.options.includeNestedFolders,
+                    filterQuery: args.options.messageFilter,
+                    sourceFolderIds: args.options.sourceFoldersIds
+                }
+            };
+            const result = await request.post(requestOptions);
+            await logger.log(result);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+}
+export default new OutlookMailSearchFolderAddCommand();
+//# sourceMappingURL=mail-searchfolder-add.js.map

package/dist/m365/outlook/commands.js

@@ -1,5 +1,6 @@
 const prefix = 'outlook';
 export default {
+    MAIL_SEARCHFOLDER_ADD: `${prefix} mail searchfolder add`,
     MAIL_SEND: `${prefix} mail send`,
     MAILBOX_SETTINGS_GET: `${prefix} mailbox settings get`,
     MAILBOX_SETTINGS_SET: `${prefix} mailbox settings set`,

package/dist/m365/pa/commands/environment/environment-get.js

@@ -1,13 +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 _PaEnvironmentGetCommand_instances, _PaEnvironmentGetCommand_initTelemetry, _PaEnvironmentGetCommand_initOptions;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
+import { zod } from '../../../../utils/zod.js';
 import PowerAppsCommand from '../../../base/PowerAppsCommand.js';
 import commands from '../../commands.js';
+const options = globalOptionsZod
+    .extend({
+    name: zod.alias('n', z.string().optional()),
+    default: z.boolean().optional()
+})
+    .strict();
 class PaEnvironmentGetCommand extends PowerAppsCommand {
     get name() {
         return commands.ENVIRONMENT_GET;
@@ -15,17 +18,20 @@ class PaEnvironmentGetCommand extends PowerAppsCommand {
     get description() {
         return 'Gets information about the specified Microsoft Power Apps environment';
     }
-    constructor() {
-        super();
-        _PaEnvironmentGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _PaEnvironmentGetCommand_instances, "m", _PaEnvironmentGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _PaEnvironmentGetCommand_instances, "m", _PaEnvironmentGetCommand_initOptions).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => !!options.name !== !!options.default, {
+            message: `Specify either name or default, but not both.`
+        });
     }
     async commandAction(logger, args) {
         if (this.verbose) {
             await logger.logToStderr(`Retrieving information about Microsoft Power Apps environment ${args.options.name || 'default'}...`);
         }
-        const environmentName = args.options.name ? formatting.encodeQueryParameter(args.options.name) : '~default';
+        const environmentName = args.options.default ? '~default' : formatting.encodeQueryParameter(args.options.name);
         const requestOptions = {
             url: `${this.resource}/providers/Microsoft.PowerApps/environments/${environmentName}?api-version=2016-11-01`,
             headers: {
@@ -47,16 +53,5 @@ class PaEnvironmentGetCommand extends PowerAppsCommand {
         }
     }
 }
-_PaEnvironmentGetCommand_instances = new WeakSet(), _PaEnvironmentGetCommand_initTelemetry = function _PaEnvironmentGetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            name: typeof args.options.name !== 'undefined'
-        });
-    });
-}, _PaEnvironmentGetCommand_initOptions = function _PaEnvironmentGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-n, --name [name]'
-    });
-};
 export default new PaEnvironmentGetCommand();
 //# sourceMappingURL=environment-get.js.map

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

@@ -18,9 +18,6 @@ class PpCopilotGetCommand extends PowerPlatformCommand {
     get description() {
         return 'Get information about the specified copilot';
     }
-    alias() {
-        return [commands.CHATBOT_GET];
-    }
     constructor() {
         super();
         _PpCopilotGetCommand_instances.add(this);
@@ -30,7 +27,6 @@ class PpCopilotGetCommand extends PowerPlatformCommand {
         __classPrivateFieldGet(this, _PpCopilotGetCommand_instances, "m", _PpCopilotGetCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
-        await this.showDeprecationWarning(logger, commands.CHATBOT_GET, commands.COPILOT_GET);
         if (this.verbose) {
             await logger.logToStderr(`Retrieving copilot '${args.options.id || args.options.name}'...`);
         }

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

@@ -15,9 +15,6 @@ class PpCopilotListCommand extends PowerPlatformCommand {
     get description() {
         return 'Lists Microsoft Power Platform copilots in the specified Power Platform environment';
     }
-    alias() {
-        return [commands.CHATBOT_LIST];
-    }
     defaultProperties() {
         return ['name', 'botid', 'publishedOn', 'createdOn', 'botModifiedOn'];
     }
@@ -28,7 +25,6 @@ class PpCopilotListCommand extends PowerPlatformCommand {
         __classPrivateFieldGet(this, _PpCopilotListCommand_instances, "m", _PpCopilotListCommand_initOptions).call(this);
     }
     async commandAction(logger, args) {
-        await this.showDeprecationWarning(logger, commands.CHATBOT_LIST, commands.COPILOT_LIST);
         if (this.verbose) {
             await logger.logToStderr(`Retrieving list of copilots for environment '${args.options.environmentName}'.`);
         }

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

@@ -18,9 +18,6 @@ class PpCopilotRemoveCommand extends PowerPlatformCommand {
     get description() {
         return 'Removes the specified copilot';
     }
-    alias() {
-        return [commands.CHATBOT_REMOVE];
-    }
     constructor() {
         super();
         _PpCopilotRemoveCommand_instances.add(this);
@@ -30,7 +27,6 @@ class PpCopilotRemoveCommand extends PowerPlatformCommand {
         __classPrivateFieldGet(this, _PpCopilotRemoveCommand_instances, "m", _PpCopilotRemoveCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
-        await this.showDeprecationWarning(logger, commands.CHATBOT_REMOVE, commands.COPILOT_REMOVE);
         if (this.verbose) {
             await logger.logToStderr(`Removing copilot '${args.options.id || args.options.name}'...`);
         }

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

@@ -1,13 +1,17 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _PpEnvironmentGetCommand_instances, _PpEnvironmentGetCommand_initTelemetry, _PpEnvironmentGetCommand_initOptions;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
+import { zod } from '../../../../utils/zod.js';
 import PowerPlatformCommand from '../../../base/PowerPlatformCommand.js';
 import commands from '../../commands.js';
+const options = globalOptionsZod
+    .extend({
+    name: zod.alias('n', z.string().optional()),
+    default: z.boolean().optional(),
+    asAdmin: z.boolean().optional()
+})
+    .strict();
 class PpEnvironmentGetCommand extends PowerPlatformCommand {
     get name() {
         return commands.ENVIRONMENT_GET;
@@ -15,11 +19,14 @@ class PpEnvironmentGetCommand extends PowerPlatformCommand {
     get description() {
         return 'Gets information about the specified Power Platform environment';
     }
-    constructor() {
-        super();
-        _PpEnvironmentGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _PpEnvironmentGetCommand_instances, "m", _PpEnvironmentGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _PpEnvironmentGetCommand_instances, "m", _PpEnvironmentGetCommand_initOptions).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => !!options.name !== !!options.default, {
+            message: `Specify either name or default, but not both.`
+        });
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -29,7 +36,7 @@ class PpEnvironmentGetCommand extends PowerPlatformCommand {
         if (args.options.asAdmin) {
             url += '/scopes/admin';
         }
-        const envName = args.options.name ? formatting.encodeQueryParameter(args.options.name) : '~Default';
+        const envName = args.options.default ? '~Default' : formatting.encodeQueryParameter(args.options.name);
         url += `/environments/${envName}?api-version=2020-10-01`;
         const requestOptions = {
             url: url,
@@ -42,19 +49,5 @@ class PpEnvironmentGetCommand extends PowerPlatformCommand {
         await logger.log(response);
     }
 }
-_PpEnvironmentGetCommand_instances = new WeakSet(), _PpEnvironmentGetCommand_initTelemetry = function _PpEnvironmentGetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            name: typeof args.options.name !== 'undefined',
-            asAdmin: !!args.options.asAdmin
-        });
-    });
-}, _PpEnvironmentGetCommand_initOptions = function _PpEnvironmentGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-n, --name [name]'
-    }, {
-        option: '--asAdmin'
-    });
-};
 export default new PpEnvironmentGetCommand();
 //# sourceMappingURL=environment-get.js.map

package/dist/m365/pp/commands.js

@@ -3,9 +3,6 @@ export default {
     AIBUILDERMODEL_GET: `${prefix} aibuildermodel get`,
     AIBUILDERMODEL_LIST: `${prefix} aibuildermodel list`,
     AIBUILDERMODEL_REMOVE: `${prefix} aibuildermodel remove`,
-    CHATBOT_GET: `${prefix} chatbot get`,
-    CHATBOT_LIST: `${prefix} chatbot list`,
-    CHATBOT_REMOVE: `${prefix} chatbot remove`,
     COPILOT_GET: `${prefix} copilot get`,
     COPILOT_LIST: `${prefix} copilot list`,
     COPILOT_REMOVE: `${prefix} copilot remove`,