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

package/dist/m365/entra/commands/pim/pim-role-request-list.js

@@ -30,9 +30,6 @@ class EntraPimRoleRequestListCommand extends GraphCommand {
         __classPrivateFieldGet(this, _EntraPimRoleRequestListCommand_instances, "m", _EntraPimRoleRequestListCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
-        if (args.options.includePrincipalDetails) {
-            await this.warn(logger, `Parameter 'includePrincipalDetails' is deprecated. Please use 'withPrincipalDetails' instead`);
-        }
         if (this.verbose) {
             await logger.logToStderr(`Retrieving list of PIM roles requests for ${args.options.userId || args.options.userName || args.options.groupId || args.options.groupName || 'all users'}...`);
         }
@@ -54,7 +51,7 @@ class EntraPimRoleRequestListCommand extends GraphCommand {
                 queryParameters.push(`$filter=${filters.join(' and ')}`);
             }
             expands.push('roleDefinition($select=displayName)');
-            if (args.options.includePrincipalDetails || args.options.withPrincipalDetails) {
+            if (args.options.withPrincipalDetails) {
                 expands.push('principal');
             }
             queryParameters.push(`$expand=${expands.join(',')}`);
@@ -103,7 +100,6 @@ _EntraPimRoleRequestListCommand_instances = new WeakSet(), _EntraPimRoleRequestL
             groupName: typeof args.options.groupName !== 'undefined',
             createdDateTime: typeof args.options.createdDateTime !== 'undefined',
             status: typeof args.options.status !== 'undefined',
-            includePrincipalDetails: !!args.options.includePrincipalDetails,
             withPrincipalDetails: !!args.options.withPrincipalDetails
         });
     });
@@ -121,8 +117,6 @@ _EntraPimRoleRequestListCommand_instances = new WeakSet(), _EntraPimRoleRequestL
     }, {
         option: '-s, --status [status]',
         autocomplete: this.allowedStatuses
-    }, {
-        option: '--includePrincipalDetails'
     }, {
         option: '--withPrincipalDetails'
     });

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

@@ -28,33 +28,29 @@ class FlowListCommand extends PowerAutomateCommand {
         __classPrivateFieldGet(this, _FlowListCommand_instances, "m", _FlowListCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
-        if (args.options.includeSolutions) {
-            await this.warn(logger, `Parameter 'includeSolutions' is deprecated. Please use 'withSolutions' instead`);
-        }
         if (this.verbose) {
             await logger.logToStderr(`Getting Power Automate flows${args.options.asAdmin ? ' as admin' : ''} in environment '${args.options.environmentName}'...`);
         }
         try {
-            const { environmentName, asAdmin, sharingStatus, includeSolutions, withSolutions } = args.options;
+            const { environmentName, asAdmin, sharingStatus, withSolutions } = args.options;
             let items = [];
-            const shouldIncludeSolutions = withSolutions || includeSolutions;
             if (sharingStatus === 'personal') {
-                const url = this.getApiUrl(environmentName, asAdmin, shouldIncludeSolutions, 'personal');
+                const url = this.getApiUrl(environmentName, asAdmin, withSolutions, 'personal');
                 items = await odata.getAllItems(url);
             }
             else if (sharingStatus === 'sharedWithMe') {
-                const url = this.getApiUrl(environmentName, asAdmin, shouldIncludeSolutions, 'team');
+                const url = this.getApiUrl(environmentName, asAdmin, withSolutions, 'team');
                 items = await odata.getAllItems(url);
             }
             else if (sharingStatus === 'all') {
-                let url = this.getApiUrl(environmentName, asAdmin, shouldIncludeSolutions, 'personal');
+                let url = this.getApiUrl(environmentName, asAdmin, withSolutions, 'personal');
                 items = await odata.getAllItems(url);
-                url = this.getApiUrl(environmentName, asAdmin, shouldIncludeSolutions, 'team');
+                url = this.getApiUrl(environmentName, asAdmin, withSolutions, 'team');
                 const teamFlows = await odata.getAllItems(url);
                 items = items.concat(teamFlows);
             }
             else {
-                const url = this.getApiUrl(environmentName, asAdmin, shouldIncludeSolutions);
+                const url = this.getApiUrl(environmentName, asAdmin, withSolutions);
                 items = await odata.getAllItems(url);
             }
             // Remove duplicates
@@ -84,7 +80,6 @@ _FlowListCommand_instances = new WeakSet(), _FlowListCommand_initTelemetry = fun
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             sharingStatus: typeof args.options.sharingStatus !== 'undefined',
-            includeSolutions: !!args.options.includeSolutions,
             withSolutions: !!args.options.withSolutions,
             asAdmin: !!args.options.asAdmin
         });
@@ -95,8 +90,6 @@ _FlowListCommand_instances = new WeakSet(), _FlowListCommand_initTelemetry = fun
     }, {
         option: '--sharingStatus [sharingStatus]',
         autocomplete: this.allowedSharingStatuses
-    }, {
-        option: '--includeSolutions'
     }, {
         option: '--withSolutions'
     }, {
@@ -114,7 +107,7 @@ _FlowListCommand_instances = new WeakSet(), _FlowListCommand_initTelemetry = fun
     });
 }, _FlowListCommand_initTypes = function _FlowListCommand_initTypes() {
     this.types.string.push('environmentName', 'sharingStatus');
-    this.types.boolean.push('includeSolutions', 'withSolutions', 'asAdmin');
+    this.types.boolean.push('withSolutions', 'asAdmin');
 };
 export default new FlowListCommand();
 //# sourceMappingURL=flow-list.js.map

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

@@ -27,9 +27,6 @@ class FlowRunGetCommand extends PowerAutomateCommand {
         if (this.verbose) {
             await logger.logToStderr(`Retrieving information about run ${args.options.name} of Microsoft Flow ${args.options.flowName}...`);
         }
-        if (args.options.includeTriggerInformation) {
-            await this.warn(logger, `Parameter 'includeTriggerInformation' is deprecated. Please use 'withTrigger' instead`);
-        }
         const actionsParameter = args.options.withActions ? '$expand=properties%2Factions&' : '';
         const requestOptions = {
             url: `${PowerAutomateCommand.resource}/providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/runs/${formatting.encodeQueryParameter(args.options.name)}?${actionsParameter}api-version=2016-11-01`,
@@ -44,7 +41,7 @@ class FlowRunGetCommand extends PowerAutomateCommand {
             res.endTime = res.properties.endTime || '';
             res.status = res.properties.status;
             res.triggerName = res.properties.trigger.name;
-            if ((args.options.includeTriggerInformation || args.options.withTrigger) && res.properties.trigger.outputsLink) {
+            if (args.options.withTrigger && res.properties.trigger.outputsLink) {
                 res.triggerInformation = await this.getTriggerInformation(res);
             }
             if (!!args.options.withActions) {
@@ -96,8 +93,6 @@ _FlowRunGetCommand_instances = new WeakSet(), _FlowRunGetCommand_initOptions = f
         option: '--flowName <flowName>'
     }, {
         option: '-e, --environmentName <environmentName>'
-    }, {
-        option: '--includeTriggerInformation'
     }, {
         option: '--withTrigger'
     }, {
@@ -116,7 +111,6 @@ _FlowRunGetCommand_instances = new WeakSet(), _FlowRunGetCommand_initOptions = f
 }, _FlowRunGetCommand_initTelemetry = function _FlowRunGetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            includeTriggerInformation: !!args.options.includeTriggerInformation,
             withTrigger: !!args.options.withTrigger,
             withActions: typeof args.options.withActions !== 'undefined'
         });

package/dist/m365/graph/commands/openextension/openextension-add.js

@@ -12,7 +12,7 @@ const options = globalOptionsZod
     resourceId: zod.alias('i', z.string()),
     resourceType: zod.alias('t', z.enum(['user', 'group', 'device', 'organization']))
 })
-    .and(z.any());
+    .passthrough();
 class GraphOpenExtensionAddCommand extends GraphCommand {
     get name() {
         return commands.OPENEXTENSION_ADD;
@@ -38,7 +38,7 @@ class GraphOpenExtensionAddCommand extends GraphCommand {
         try {
             const requestBody = {};
             requestBody["extensionName"] = args.options.name;
-            const unknownOptions = optionsUtils.getUnknownOptions(args.options, this.options);
+            const unknownOptions = optionsUtils.getUnknownOptions(args.options, zod.schemaToOptions(this.schema));
             const unknownOptionsNames = Object.getOwnPropertyNames(unknownOptions);
             unknownOptionsNames.forEach(async (o) => {
                 try {

package/dist/m365/graph/commands/openextension/openextension-set.js

@@ -13,11 +13,10 @@ const options = globalOptionsZod
     resourceType: zod.alias('t', z.enum(['user', 'group', 'device', 'organization'])),
     keepUnchangedProperties: zod.alias('k', z.boolean().optional())
 })
-    .and(z.any());
+    .passthrough();
 class GraphOpenExtensionSetCommand extends GraphCommand {
     constructor() {
         super(...arguments);
-        this.commandOptions = ['keepUnchangedProperties', 'resourceType', 'resourceId', 'name'];
         this.defaultOpenExtensionProperties = ['id', 'extensionName'];
     }
     get name() {
@@ -46,12 +45,9 @@ class GraphOpenExtensionSetCommand extends GraphCommand {
             const currentExtensionNames = Object.getOwnPropertyNames(currentExtension);
             const requestBody = {};
             requestBody["@odata.type"] = '#microsoft.graph.openTypeExtension';
-            const unknownOptions = optionsUtils.getUnknownOptions(args.options, this.options);
+            const unknownOptions = optionsUtils.getUnknownOptions(args.options, zod.schemaToOptions(this.schema));
             const unknownOptionsNames = Object.getOwnPropertyNames(unknownOptions);
             unknownOptionsNames.forEach(async (option) => {
-                if (this.commandOptions.includes(option)) {
-                    return;
-                }
                 const value = unknownOptions[option];
                 if (value === "") {
                     requestBody[option] = null;

package/dist/m365/graph/commands/subscription/subscription-add.js

@@ -49,7 +49,7 @@ class GraphSubscriptionAddCommand extends GraphCommand {
             notificationUrl: args.options.notificationUrl,
             expirationDateTime: await this.getExpirationDateTimeOrDefault(logger, args),
             clientState: args.options.clientState,
-            includeResourceData: args.options.withResourceData || args.options.includeResourceData,
+            includeResourceData: args.options.withResourceData,
             encryptionCertificate: args.options.encryptionCertificate,
             encryptionCertificateId: args.options.encryptionCertificateId,
             lifecycleNotificationUrl: args.options.lifecycleNotificationUrl,
@@ -66,9 +66,6 @@ class GraphSubscriptionAddCommand extends GraphCommand {
             responseType: 'json'
         };
         try {
-            if (args.options.includeResourceData) {
-                await this.warn(logger, `Parameter 'includeResourceData' is deprecated. Please use 'withResourceData' instead`);
-            }
             const res = await request.post(requestOptions);
             await logger.log(res);
         }
@@ -135,7 +132,6 @@ _GraphSubscriptionAddCommand_instances = new WeakSet(), _GraphSubscriptionAddCom
             lifecycleNotificationUrl: typeof args.options.lifecycleNotificationUrl !== 'undefined',
             notificationUrlAppId: typeof args.options.notificationUrlAppId !== 'undefined',
             latestTLSVersion: typeof args.options.latestTLSVersion !== 'undefined',
-            includeResourceData: !!args.options.includeResourceData,
             withResourceData: !!args.options.withResourceData,
             encryptionCertificate: typeof args.options.encryptionCertificate !== 'undefined',
             encryptionCertificateId: typeof args.options.encryptionCertificateId !== 'undefined'
@@ -160,8 +156,6 @@ _GraphSubscriptionAddCommand_instances = new WeakSet(), _GraphSubscriptionAddCom
     }, {
         option: '--latestTLSVersion [latestTLSVersion]',
         autocomplete: this.allowedTlsVersions
-    }, {
-        option: '--includeResourceData [includeResourceData]'
     }, {
         option: '--withResourceData [withResourceData]'
     }, {
@@ -193,11 +187,10 @@ _GraphSubscriptionAddCommand_instances = new WeakSet(), _GraphSubscriptionAddCom
         if (args.options.latestTLSVersion && this.allowedTlsVersions.map(x => x.toLowerCase()).indexOf(args.options.latestTLSVersion.toLowerCase()) === -1) {
             return `${args.options.latestTLSVersion} is not a valid TLS version. Allowed values are ${this.allowedTlsVersions.join(', ')}`;
         }
-        const shouldIncludeResourceData = args.options.includeResourceData || args.options.withResourceData;
-        if (shouldIncludeResourceData && !args.options.encryptionCertificate) {
+        if (args.options.withResourceData && !args.options.encryptionCertificate) {
             return `The 'encryptionCertificate' options is required to include the changed resource data`;
         }
-        if (shouldIncludeResourceData && !args.options.encryptionCertificateId) {
+        if (args.options.withResourceData && !args.options.encryptionCertificateId) {
             return `The 'encryptionCertificateId' options is required to include the changed resource data`;
         }
         if (args.options.notificationUrlAppId && !validation.isValidGuid(args.options.notificationUrlAppId)) {

package/dist/m365/pp/commands/solution/solution-publisher-list.js

@@ -25,17 +25,13 @@ class PpSolutionPublisherListCommand extends PowerPlatformCommand {
         __classPrivateFieldGet(this, _PpSolutionPublisherListCommand_instances, "m", _PpSolutionPublisherListCommand_initOptions).call(this);
     }
     async commandAction(logger, args) {
-        if (args.options.includeMicrosoftPublishers) {
-            await this.warn(logger, `Parameter 'includeMicrosoftPublishers' is deprecated. Please use 'withMicrosoftPublishers' instead`);
-        }
         if (this.verbose) {
             await logger.logToStderr(`Retrieving list of publishers...`);
         }
         try {
             const dynamicsApiUrl = await powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
-            const shouldIncludeMicrosoftPublishers = args.options.withMicrosoftPublishers || args.options.includeMicrosoftPublishers;
             const requestOptions = {
-                url: `${dynamicsApiUrl}/api/data/v9.0/publishers?$select=publisherid,uniquename,friendlyname,versionnumber,isreadonly,description,customizationprefix,customizationoptionvalueprefix${!shouldIncludeMicrosoftPublishers ? `&$filter=publisherid ne 'd21aab70-79e7-11dd-8874-00188b01e34f'` : ''}&api-version=9.1`,
+                url: `${dynamicsApiUrl}/api/data/v9.0/publishers?$select=publisherid,uniquename,friendlyname,versionnumber,isreadonly,description,customizationprefix,customizationoptionvalueprefix${!args.options.withMicrosoftPublishers ? `&$filter=publisherid ne 'd21aab70-79e7-11dd-8874-00188b01e34f'` : ''}&api-version=9.1`,
                 headers: {
                     accept: 'application/json;odata.metadata=none'
                 },
@@ -52,7 +48,6 @@ class PpSolutionPublisherListCommand extends PowerPlatformCommand {
 _PpSolutionPublisherListCommand_instances = new WeakSet(), _PpSolutionPublisherListCommand_initTelemetry = function _PpSolutionPublisherListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            includeMicrosoftPublishers: typeof args.options.includeMicrosoftPublishers !== 'undefined',
             withMicrosoftPublishers: typeof args.options.withMicrosoftPublishers !== 'undefined',
             asAdmin: !!args.options.asAdmin
         });
@@ -60,8 +55,6 @@ _PpSolutionPublisherListCommand_instances = new WeakSet(), _PpSolutionPublisherL
 }, _PpSolutionPublisherListCommand_initOptions = function _PpSolutionPublisherListCommand_initOptions() {
     this.options.unshift({
         option: '-e, --environmentName <environmentName>'
-    }, {
-        option: '--includeMicrosoftPublishers'
     }, {
         option: '--withMicrosoftPublishers'
     }, {

package/dist/m365/purview/commands/threatassessment/threatassessment-get.js

@@ -24,15 +24,11 @@ class PurviewThreatAssessmentGetCommand extends GraphCommand {
     }
     async commandAction(logger, args) {
         try {
-            if (args.options.includeResults) {
-                await this.warn(logger, `Parameter 'includeResults' is deprecated. Please use 'withResults' instead`);
-            }
             if (this.verbose) {
                 await logger.logToStderr(`Retrieving threat assessment with id ${args.options.id}`);
             }
-            const shouldIncludeResults = args.options.includeResults || args.options.withResults;
             const requestOptions = {
-                url: `${this.resource}/v1.0/informationProtection/threatAssessmentRequests/${args.options.id}${shouldIncludeResults ? '?$expand=results' : ''}`,
+                url: `${this.resource}/v1.0/informationProtection/threatAssessmentRequests/${args.options.id}${args.options.withResults ? '?$expand=results' : ''}`,
                 headers: {
                     accept: 'application/json;odata.metadata=none'
                 },
@@ -56,8 +52,6 @@ _PurviewThreatAssessmentGetCommand_instances = new WeakSet(), _PurviewThreatAsse
 }, _PurviewThreatAssessmentGetCommand_initOptions = function _PurviewThreatAssessmentGetCommand_initOptions() {
     this.options.unshift({
         option: '-i, --id <id>'
-    }, {
-        option: '--includeResults'
     }, {
         option: '--withResults'
     });

package/dist/m365/spe/commands/container/container-add.js

@@ -4,7 +4,6 @@ import { zod } from '../../../../utils/zod.js';
 import commands from '../../commands.js';
 import { validation } from '../../../../utils/validation.js';
 import { spe } from '../../../../utils/spe.js';
-import { spo } from '../../../../utils/spo.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import request from '../../../../request.js';
 const options = globalOptionsZod
@@ -77,8 +76,7 @@ class SpeContainerAddCommand extends GraphCommand {
         if (this.verbose) {
             await logger.logToStderr(`Getting container type with name '${options.containerTypeName}'...`);
         }
-        const adminUrl = await spo.getSpoAdminUrl(logger, this.verbose);
-        return spe.getContainerTypeIdByName(adminUrl, options.containerTypeName);
+        return spe.getContainerTypeIdByName(options.containerTypeName);
     }
 }
 export default new SpeContainerAddCommand();

package/dist/m365/spe/commands/container/container-list.js

@@ -10,7 +10,6 @@ import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 import { spe } from '../../../../utils/spe.js';
-import { spo } from '../../../../utils/spo.js';
 class SpeContainerListCommand extends GraphCommand {
     get name() {
         return commands.CONTAINER_LIST;
@@ -47,8 +46,7 @@ class SpeContainerListCommand extends GraphCommand {
         if (options.containerTypeId) {
             return options.containerTypeId;
         }
-        const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
-        return spe.getContainerTypeIdByName(spoAdminUrl, options.containerTypeName);
+        return spe.getContainerTypeIdByName(options.containerTypeName);
     }
 }
 _SpeContainerListCommand_instances = new WeakSet(), _SpeContainerListCommand_initTelemetry = function _SpeContainerListCommand_initTelemetry() {

package/dist/m365/spe/commands/container/container-recyclebinitem-list.js

@@ -2,7 +2,6 @@ import { globalOptionsZod } from '../../../../Command.js';
 import { z } from 'zod';
 import commands from '../../commands.js';
 import { validation } from '../../../../utils/validation.js';
-import { spo } from '../../../../utils/spo.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import { spe } from '../../../../utils/spe.js';
 import { odata } from '../../../../utils/odata.js';
@@ -54,8 +53,7 @@ class SpeContainerRecycleBinItemListCommand extends GraphCommand {
         if (this.verbose) {
             await logger.logToStderr(`Retrieving container type id for container type '${options.containerTypeName}'...`);
         }
-        const adminUrl = await spo.getSpoAdminUrl(logger, this.verbose);
-        return spe.getContainerTypeIdByName(adminUrl, options.containerTypeName);
+        return spe.getContainerTypeIdByName(options.containerTypeName);
     }
 }
 export default new SpeContainerRecycleBinItemListCommand();

package/dist/m365/spe/commands/container/container-recyclebinitem-restore.js

@@ -2,7 +2,6 @@ import { globalOptionsZod } from '../../../../Command.js';
 import { z } from 'zod';
 import commands from '../../commands.js';
 import { validation } from '../../../../utils/validation.js';
-import { spo } from '../../../../utils/spo.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import { spe } from '../../../../utils/spe.js';
 import { odata } from '../../../../utils/odata.js';
@@ -88,8 +87,7 @@ class SpeContainerRecycleBinItemRestoreCommand extends GraphCommand {
         if (this.verbose) {
             await logger.logToStderr(`Getting container type with name '${options.containerTypeName}'...`);
         }
-        const adminUrl = await spo.getSpoAdminUrl(logger, this.verbose);
-        return spe.getContainerTypeIdByName(adminUrl, options.containerTypeName);
+        return spe.getContainerTypeIdByName(options.containerTypeName);
     }
 }
 export default new SpeContainerRecycleBinItemRestoreCommand();

package/dist/m365/spe/commands/container/container-remove.js

@@ -4,7 +4,6 @@ import { zod } from '../../../../utils/zod.js';
 import commands from '../../commands.js';
 import { validation } from '../../../../utils/validation.js';
 import { spe } from '../../../../utils/spe.js';
-import { spo } from '../../../../utils/spo.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import request from '../../../../request.js';
 import { cli } from '../../../../cli/cli.js';
@@ -91,8 +90,7 @@ class SpeContainerRemoveCommand extends GraphCommand {
         if (this.verbose) {
             await logger.logToStderr(`Getting container type with name '${options.containerTypeName}'...`);
         }
-        const adminUrl = await spo.getSpoAdminUrl(logger, this.verbose);
-        return spe.getContainerTypeIdByName(adminUrl, options.containerTypeName);
+        return spe.getContainerTypeIdByName(options.containerTypeName);
     }
 }
 export default new SpeContainerRemoveCommand();

package/dist/m365/spe/commands/containertype/containertype-add.js

@@ -1,115 +1,92 @@
-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 _SpeContainerTypeAddCommand_instances, _SpeContainerTypeAddCommand_initTelemetry, _SpeContainerTypeAddCommand_initOptions, _SpeContainerTypeAddCommand_initValidators;
-import config from '../../../../config.js';
+import { globalOptionsZod } from '../../../../Command.js';
+import { z } from 'zod';
+import { zod } from '../../../../utils/zod.js';
 import request from '../../../../request.js';
-import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
-import SpoCommand from '../../../base/SpoCommand.js';
+import GraphDelegatedCommand from '../../../base/GraphDelegatedCommand.js';
 import commands from '../../commands.js';
-class SpeContainerTypeAddCommand extends SpoCommand {
+import Auth from '../../../../Auth.js';
+const consumingTenantOverridablesOptions = ['urlTemplate', 'isDiscoverabilityEnabled', 'isSearchEnabled', 'isItemVersioningEnabled', 'itemMajorVersionLimit', 'maxStoragePerContainerInBytes'];
+const options = globalOptionsZod
+    .extend({
+    name: zod.alias('n', z.string()),
+    appId: z.string()
+        .refine(id => validation.isValidGuid(id), id => ({
+        message: `'${id}' is not a valid GUID.`
+    })).optional(),
+    billingType: z.enum(['standard', 'trial', 'directToCustomer']).default('standard'),
+    consumingTenantOverridables: z.string()
+        .refine(values => values.split(',').every(v => consumingTenantOverridablesOptions.includes(v.trim())), values => ({
+        message: `'${values}' is not a valid value. Valid options are: ${consumingTenantOverridablesOptions.join(', ')}.`
+    })).optional(),
+    isDiscoverabilityEnabled: z.boolean().optional(),
+    isItemVersioningEnabled: z.boolean().optional(),
+    isSearchEnabled: z.boolean().optional(),
+    isSharingRestricted: z.boolean().optional(),
+    itemMajorVersionLimit: z.number()
+        .refine(n => validation.isValidPositiveInteger(n), n => ({
+        message: `'${n}' is not a valid positive integer.`
+    })).optional(),
+    maxStoragePerContainerInBytes: z.number()
+        .refine(n => validation.isValidPositiveInteger(n), n => ({
+        message: `'${n}' is not a valid positive integer.`
+    })).optional(),
+    sharingCapability: z.enum(['disabled', 'externalUserSharingOnly', 'externalUserAndGuestSharing', 'existingExternalUserSharingOnly']).optional(),
+    urlTemplate: z.string().optional()
+})
+    .strict();
+class SpeContainerTypeAddCommand extends GraphDelegatedCommand {
     get name() {
         return commands.CONTAINERTYPE_ADD;
     }
     get description() {
-        return 'Creates a new Container Type for your app';
+        return 'Creates a new container type';
     }
-    constructor() {
-        super();
-        _SpeContainerTypeAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpeContainerTypeAddCommand_instances, "m", _SpeContainerTypeAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpeContainerTypeAddCommand_instances, "m", _SpeContainerTypeAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpeContainerTypeAddCommand_instances, "m", _SpeContainerTypeAddCommand_initValidators).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => !options.itemMajorVersionLimit || options.isItemVersioningEnabled !== false, {
+            message: `Cannot set itemMajorVersionLimit when isItemVersioningEnabled is false.`
+        });
     }
     async commandAction(logger, args) {
         try {
             if (this.verbose) {
-                await logger.logToStderr(`Creating a new Container Type for your app with name ${args.options.name}`);
+                await logger.logToStderr(`Creating a new Container Type for your app with name '${args.options.name}'.`);
             }
-            const adminUrl = await spo.getSpoAdminUrl(logger, this.debug);
-            const requestBody = this.getRequestBody(args.options);
-            const formDigestInfo = await spo.ensureFormDigest(adminUrl, logger, undefined, this.debug);
+            const appId = args.options.appId ?? Auth.connection.appId;
             const requestOptions = {
-                url: `${adminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                url: `${this.resource}/beta/storage/fileStorage/containerTypes`,
                 headers: {
-                    'X-RequestDigest': formDigestInfo.FormDigestValue
+                    accept: 'application/json;odata.metadata=none'
                 },
-                data: requestBody
+                responseType: 'json',
+                data: {
+                    name: args.options.name,
+                    owningAppId: appId,
+                    billingClassification: args.options.billingType,
+                    settings: {
+                        consumingTenantOverridables: args.options.consumingTenantOverridables?.split(',').map(s => s.trim()).join(','),
+                        isDiscoverabilityEnabled: args.options.isDiscoverabilityEnabled,
+                        isItemVersioningEnabled: args.options.isItemVersioningEnabled,
+                        isSearchEnabled: args.options.isSearchEnabled,
+                        isSharingRestricted: args.options.isSharingRestricted,
+                        itemMajorVersionLimit: args.options.itemMajorVersionLimit,
+                        maxStoragePerContainerInBytes: args.options.maxStoragePerContainerInBytes,
+                        sharingCapability: args.options.sharingCapability,
+                        urlTemplate: args.options.urlTemplate
+                    }
+                }
             };
-            const res = await request.post(requestOptions);
-            const json = JSON.parse(res);
-            const response = json[0];
-            if (response.ErrorInfo) {
-                throw response.ErrorInfo.ErrorMessage;
-            }
-            const result = json.pop();
-            delete result._ObjectType_;
-            result.SPContainerTypeBillingClassification = args.options.trial ? 'Trial' : 'Standard';
-            result.AzureSubscriptionId = this.replaceString(result.AzureSubscriptionId);
-            result.OwningAppId = this.replaceString(result.OwningAppId);
-            result.OwningTenantId = this.replaceString(result.OwningTenantId);
-            result.ContainerTypeId = this.replaceString(result.ContainerTypeId);
-            await logger.log(result);
+            const response = await request.post(requestOptions);
+            await logger.log(response);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    replaceString(s) {
-        return s.replace('/Guid(', '').replace(')/', '');
-    }
-    getRequestBody(options) {
-        if (options.trial) {
-            return `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="4" ObjectPathId="3" /><Method Name="NewSPOContainerType" Id="5" ObjectPathId="3"><Parameters><Parameter TypeId="{5466648e-c306-441b-9df4-c09deef25cb1}"><Property Name="AzureSubscriptionId" Type="Guid">{00000000-0000-0000-0000-000000000000}</Property><Property Name="ContainerTypeId" Type="Guid">{00000000-0000-0000-0000-000000000000}</Property><Property Name="CreationDate" Type="Null" /><Property Name="DisplayName" Type="String">${options.name}</Property><Property Name="ExpiryDate" Type="Null" /><Property Name="IsBillingProfileRequired" Type="Boolean">false</Property><Property Name="OwningAppId" Type="Guid">{${options.applicationId}}</Property><Property Name="OwningTenantId" Type="Guid">{00000000-0000-0000-0000-000000000000}</Property><Property Name="Region" Type="Null" /><Property Name="ResourceGroup" Type="Null" /><Property Name="SPContainerTypeBillingClassification" Type="Enum">1</Property></Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="3" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`;
-        }
-        return `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><Method Name="NewSPOContainerType" Id="4" ObjectPathId="1"><Parameters><Parameter TypeId="{5466648e-c306-441b-9df4-c09deef25cb1}"><Property Name="AzureSubscriptionId" Type="Guid">{${options.azureSubscriptionId}}</Property><Property Name="ContainerTypeId" Type="Guid">{00000000-0000-0000-0000-000000000000}</Property><Property Name="CreationDate" Type="Null" /><Property Name="DisplayName" Type="String">${options.name}</Property><Property Name="ExpiryDate" Type="Null" /><Property Name="IsBillingProfileRequired" Type="Boolean">false</Property><Property Name="OwningAppId" Type="Guid">{${options.applicationId}}</Property><Property Name="OwningTenantId" Type="Guid">{00000000-0000-0000-0000-000000000000}</Property><Property Name="Region" Type="String">${options.region}</Property><Property Name="ResourceGroup" Type="String">${options.resourceGroup}</Property><Property Name="SPContainerTypeBillingClassification" Type="Enum">0</Property></Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="1" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`;
-    }
 }
-_SpeContainerTypeAddCommand_instances = new WeakSet(), _SpeContainerTypeAddCommand_initTelemetry = function _SpeContainerTypeAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            trial: !!args.options.trial,
-            azureSubscriptionId: typeof args.options.azureSubscriptionId !== 'undefined',
-            resourceGroup: typeof args.options.resourceGroup !== 'undefined',
-            region: typeof args.options.region !== 'undefined'
-        });
-    });
-}, _SpeContainerTypeAddCommand_initOptions = function _SpeContainerTypeAddCommand_initOptions() {
-    this.options.unshift({
-        option: '-n, --name <name>'
-    }, {
-        option: '--applicationId <applicationId>'
-    }, {
-        option: '--trial'
-    }, {
-        option: '--azureSubscriptionId [azureSubscriptionId]'
-    }, {
-        option: '--resourceGroup [resourceGroup]'
-    }, {
-        option: '--region [region]'
-    });
-}, _SpeContainerTypeAddCommand_initValidators = function _SpeContainerTypeAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (!validation.isValidGuid(args.options.applicationId)) {
-            return `${args.options.applicationId} is not a valid GUID for option applicationId.`;
-        }
-        if (args.options.trial === undefined && !args.options.azureSubscriptionId) {
-            return 'You must specify the azureSubscriptionId when creating a non-trial environment.';
-        }
-        if (args.options.trial === undefined && !args.options.resourceGroup) {
-            return 'You must specify the resourceGroup when creating a non-trial environment.';
-        }
-        if (args.options.trial === undefined && !args.options.region) {
-            return 'You must specify the region when creating a non-trial environment.';
-        }
-        if (args.options.azureSubscriptionId && !validation.isValidGuid(args.options.azureSubscriptionId)) {
-            return `${args.options.azureSubscriptionId} is not a valid GUID for option azureSubscriptionId.`;
-        }
-        return true;
-    });
-};
 export default new SpeContainerTypeAddCommand();
 //# sourceMappingURL=containertype-add.js.map