@pnp/cli-microsoft365 11.0.0-beta.88d51e6 → 11.0.0

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

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

@@ -1,99 +1,71 @@
-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 _SpeContainerTypeGetCommand_instances, _SpeContainerTypeGetCommand_initTelemetry, _SpeContainerTypeGetCommand_initOptions, _SpeContainerTypeGetCommand_initOptionSets, _SpeContainerTypeGetCommand_initValidators, _SpeContainerTypeGetCommand_initTypes;
-import config from '../../../../config.js';
-import request from '../../../../request.js';
-import { spe } from '../../../../utils/spe.js';
-import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
-import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
-class SpeContainerTypeGetCommand extends SpoCommand {
+import { globalOptionsZod } from '../../../../Command.js';
+import { z } from 'zod';
+import { zod } from '../../../../utils/zod.js';
+import GraphDelegatedCommand from '../../../base/GraphDelegatedCommand.js';
+import { formatting } from '../../../../utils/formatting.js';
+import request from '../../../../request.js';
+import { odata } from '../../../../utils/odata.js';
+import { cli } from '../../../../cli/cli.js';
+const options = globalOptionsZod
+    .extend({
+    id: zod.alias('i', z.string()
+        .refine(id => validation.isValidGuid(id), id => ({
+        message: `'${id}' is not a valid GUID.`
+    }))
+        .optional()),
+    name: zod.alias('n', z.string().optional())
+})
+    .strict();
+class SpeContainerTypeGetCommand extends GraphDelegatedCommand {
     get name() {
         return commands.CONTAINERTYPE_GET;
     }
     get description() {
-        return 'Get a Container Type';
+        return 'Gets a container type';
+    }
+    get schema() {
+        return options;
     }
-    constructor() {
-        super();
-        _SpeContainerTypeGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpeContainerTypeGetCommand_instances, "m", _SpeContainerTypeGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpeContainerTypeGetCommand_instances, "m", _SpeContainerTypeGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpeContainerTypeGetCommand_instances, "m", _SpeContainerTypeGetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpeContainerTypeGetCommand_instances, "m", _SpeContainerTypeGetCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _SpeContainerTypeGetCommand_instances, "m", _SpeContainerTypeGetCommand_initTypes).call(this);
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => [options.id, options.name].filter(o => o !== undefined).length === 1, {
+            message: 'Use one of the following options: id or name.'
+        });
     }
     async commandAction(logger, args) {
         try {
-            const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
-            const containerTypeId = await this.getContainerTypeId(args.options, spoAdminUrl, logger);
-            const containerType = await this.getContainerTypeById(containerTypeId, spoAdminUrl, logger);
-            await logger.log(containerType);
+            let result;
+            if (args.options.name) {
+                const containerTypes = await odata.getAllItems(`${this.resource}/beta/storage/fileStorage/containerTypes?$filter=name eq '${formatting.encodeQueryParameter(args.options.name)}'`);
+                if (containerTypes.length === 0) {
+                    throw `The specified container type '${args.options.name}' does not exist.`;
+                }
+                if (containerTypes.length > 1) {
+                    const containerKeyValuePair = formatting.convertArrayToHashTable('id', containerTypes);
+                    result = await cli.handleMultipleResultsFound(`Multiple container types with name '${args.options.name}' found.`, containerKeyValuePair);
+                }
+                else {
+                    result = containerTypes[0];
+                }
+            }
+            else {
+                const requestOptions = {
+                    url: `${this.resource}/beta/storage/fileStorage/containerTypes/${args.options.id}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json'
+                };
+                result = await request.get(requestOptions);
+            }
+            await logger.log(result);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    async getContainerTypeById(containerTypeId, spoAdminUrl, logger) {
-        if (this.verbose) {
-            await logger.logToStderr(`Getting the Container type...`);
-        }
-        const requestOptions = {
-            url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
-            headers: {
-                accept: 'application/json;odata=nometadata'
-            },
-            responseType: 'json',
-            data: `<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="49" ObjectPathId="48" /><Method Name="GetSPOContainerTypeById" Id="50" ObjectPathId="48"><Parameters><Parameter Type="Guid">{${containerTypeId}}</Parameter><Parameter Type="Enum">1</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="48" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
-        };
-        const res = await request.post(requestOptions);
-        const response = res[0];
-        if (response.ErrorInfo) {
-            throw response.ErrorInfo.ErrorMessage;
-        }
-        const containerTypes = res[res.length - 1];
-        return containerTypes;
-    }
-    async getContainerTypeId(options, spoAdminUrl, logger) {
-        if (options.id) {
-            return options.id;
-        }
-        if (this.verbose) {
-            await logger.logToStderr(`Retrieving container type id for container type '${options.containerTypeName}'...`);
-        }
-        return spe.getContainerTypeIdByName(spoAdminUrl, options.name);
-    }
 }
-_SpeContainerTypeGetCommand_instances = new WeakSet(), _SpeContainerTypeGetCommand_initTelemetry = function _SpeContainerTypeGetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            id: typeof args.options.id !== 'undefined',
-            name: typeof args.options.name !== 'undefined'
-        });
-    });
-}, _SpeContainerTypeGetCommand_initOptions = function _SpeContainerTypeGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id [id]'
-    }, {
-        option: '-n, --name [name]'
-    });
-}, _SpeContainerTypeGetCommand_initOptionSets = function _SpeContainerTypeGetCommand_initOptionSets() {
-    this.optionSets.push({
-        options: ['id', 'name']
-    });
-}, _SpeContainerTypeGetCommand_initValidators = function _SpeContainerTypeGetCommand_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;
-    });
-}, _SpeContainerTypeGetCommand_initTypes = function _SpeContainerTypeGetCommand_initTypes() {
-    this.types.string.push('id', 'name');
-};
 export default new SpeContainerTypeGetCommand();
 //# sourceMappingURL=containertype-get.js.map

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

@@ -1,37 +1,26 @@
-import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
-import { spe } from '../../../../utils/spe.js';
-import { spo } from '../../../../utils/spo.js';
-class SpeContainerTypeListCommand extends SpoCommand {
+import GraphDelegatedCommand from '../../../base/GraphDelegatedCommand.js';
+import { odata } from '../../../../utils/odata.js';
+class SpeContainerTypeListCommand extends GraphDelegatedCommand {
     get name() {
         return commands.CONTAINERTYPE_LIST;
     }
     get description() {
-        return 'Lists all Container Types';
+        return 'Lists all container types';
     }
     defaultProperties() {
-        return ['ContainerTypeId', 'DisplayName', 'OwningAppId'];
+        return ['id', 'name', 'owningAppId'];
     }
     async commandAction(logger) {
         try {
-            const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
             if (this.verbose) {
                 await logger.logToStderr(`Retrieving list of Container types...`);
             }
-            const allContainerTypes = await spe.getAllContainerTypes(spoAdminUrl);
-            // The following conversion is done in order not to make breaking changes
-            const result = allContainerTypes.map(ct => ({
-                _ObjectType_: 'Microsoft.Online.SharePoint.TenantAdministration.SPContainerTypeProperties',
-                ...ct,
-                AzureSubscriptionId: `/Guid(${ct.AzureSubscriptionId})/`,
-                ContainerTypeId: `/Guid(${ct.ContainerTypeId})/`,
-                OwningAppId: `/Guid(${ct.OwningAppId})/`,
-                OwningTenantId: `/Guid(${ct.OwningTenantId})/`
-            }));
-            await logger.log(result);
+            const containerTypes = await odata.getAllItems(`${this.resource}/beta/storage/fileStorage/containerTypes`);
+            await logger.log(containerTypes);
         }
         catch (err) {
-            this.handleRejectedPromise(err);
+            this.handleRejectedODataJsonPromise(err);
         }
     }
 }

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

@@ -4,11 +4,11 @@ import { zod } from '../../../../utils/zod.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
 import { spo } from '../../../../utils/spo.js';
-import { spe } from '../../../../utils/spe.js';
 import { cli } from '../../../../cli/cli.js';
 import { validation } from '../../../../utils/validation.js';
 import request from '../../../../request.js';
 import config from '../../../../config.js';
+import { formatting } from '../../../../utils/formatting.js';
 const options = globalOptionsZod
     .extend({
     id: zod.alias('i', z.string()
@@ -46,14 +46,13 @@ class SpeContainerTypeRemoveCommand extends SpoCommand {
         try {
             const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.verbose);
             const containerTypeId = await this.getContainerTypeId(args.options, spoAdminUrl, logger);
-            const formDigestInfo = await spo.ensureFormDigest(spoAdminUrl, logger, undefined, this.debug);
             if (this.verbose) {
-                await logger.logToStderr(`Removing container type ${args.options.id || args.options.name}...`);
+                await logger.logToStderr(`Removing container type '${args.options.id || args.options.name}'...`);
             }
             const requestOptions = {
                 url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
                 headers: {
-                    'X-RequestDigest': formDigestInfo.FormDigestValue
+                    accept: 'application/json;odata=nometadata'
                 },
                 responseType: 'json',
                 data: `<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="7" ObjectPathId="6" /><Method Name="RemoveSPOContainerType" Id="8" ObjectPathId="6"><Parameters><Parameter TypeId="{b66ab1ca-fd51-44f9-8cfc-01f5c2a21f99}"><Property Name="ContainerTypeId" Type="Guid">{${containerTypeId}}</Property></Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="6" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
@@ -74,7 +73,30 @@ class SpeContainerTypeRemoveCommand extends SpoCommand {
         if (this.verbose) {
             await logger.logToStderr(`Retrieving container type id for container type '${options.name}'...`);
         }
-        return spe.getContainerTypeIdByName(spoAdminUrl, options.name);
+        const requestOptions = {
+            url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+            headers: {
+                accept: 'application/json;odata=nometadata'
+            },
+            responseType: 'json',
+            data: `<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="46" ObjectPathId="45" /><Method Name="GetSPOContainerTypes" Id="47" ObjectPathId="45"><Parameters><Parameter Type="Enum">1</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="45" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+        };
+        const json = await request.post(requestOptions);
+        const response = json[0];
+        if (response.ErrorInfo) {
+            throw new Error(response.ErrorInfo.ErrorMessage);
+        }
+        const allContainerTypes = json[json.length - 1];
+        const containerTypes = allContainerTypes.filter(ct => ct.DisplayName.toLowerCase() === options.name.toLowerCase());
+        if (containerTypes.length === 0) {
+            throw new Error(`The specified container type '${options.name}' does not exist.`);
+        }
+        if (containerTypes.length > 1) {
+            const containerTypeKeyValuePair = formatting.convertArrayToHashTable('ContainerTypeId', containerTypes);
+            const containerType = await cli.handleMultipleResultsFound(`Multiple container types with name '${options.name}' found.`, containerTypeKeyValuePair);
+            return formatting.extractCsomGuid(containerType.ContainerTypeId);
+        }
+        return formatting.extractCsomGuid(containerTypes[0].ContainerTypeId);
     }
 }
 export default new SpeContainerTypeRemoveCommand();

package/dist/m365/spfx/commands/project/project-upgrade.js

@@ -1,20 +1,25 @@
-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 _SpfxProjectUpgradeCommand_instances, _a, _SpfxProjectUpgradeCommand_initTelemetry, _SpfxProjectUpgradeCommand_initOptions, _SpfxProjectUpgradeCommand_initValidators;
 import fs from 'fs';
 import os from 'os';
 import path from 'path';
 // uncomment to support upgrading to preview releases
 import { prerelease } from 'semver';
-import { CommandError } from '../../../../Command.js';
+import { z } from 'zod';
+import { CommandError, globalOptionsZod } from '../../../../Command.js';
 import { fsUtil } from '../../../../utils/fsUtil.js';
 import { packageManager } from '../../../../utils/packageManager.js';
+import { zod } from '../../../../utils/zod.js';
 import commands from '../../commands.js';
 import { BaseProjectCommand } from './base-project-command.js';
 import { FN017001_MISC_npm_dedupe } from './project-upgrade/rules/FN017001_MISC_npm_dedupe.js';
+const options = globalOptionsZod
+    .extend({
+    packageManager: z.enum(['npm', 'pnpm', 'yarn']).default('npm'),
+    preview: z.boolean().optional(),
+    toVersion: zod.alias('v', z.string().optional()),
+    shell: z.enum(['bash', 'powershell', 'cmd']).default('powershell'),
+    output: z.enum(['json', 'text', 'md', 'tour', 'csv', 'none']).optional()
+})
+    .strict();
 class SpfxProjectUpgradeCommand extends BaseProjectCommand {
     get name() {
         return commands.PROJECT_UPGRADE;
@@ -25,12 +30,14 @@ class SpfxProjectUpgradeCommand extends BaseProjectCommand {
     get allowedOutputs() {
         return ['json', 'text', 'md', 'tour'];
     }
+    get schema() {
+        return options;
+    }
     constructor() {
         super();
-        _SpfxProjectUpgradeCommand_instances.add(this);
         this.toVersion = '';
-        this.packageManager = 'npm';
-        this.shell = 'bash';
+        this.packageManager = '';
+        this.shell = '';
         this.allFindings = [];
         this.supportedVersions = [
             '1.0.0',
@@ -80,14 +87,11 @@ class SpfxProjectUpgradeCommand extends BaseProjectCommand {
             '1.21.1',
             '1.22.0-beta.1'
         ];
-        __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
         this.projectRootPath = this.getProjectRoot(process.cwd());
         if (this.projectRootPath === null) {
-            throw new CommandError(`Couldn't find project root folder`, _a.ERROR_NO_PROJECT_ROOT_FOLDER);
+            throw new CommandError(`Couldn't find project root folder`, SpfxProjectUpgradeCommand.ERROR_NO_PROJECT_ROOT_FOLDER);
         }
         this.toVersion = args.options.toVersion ? args.options.toVersion : this.supportedVersions[this.supportedVersions.length - 1];
         // uncomment to support upgrading to preview releases
@@ -101,21 +105,21 @@ class SpfxProjectUpgradeCommand extends BaseProjectCommand {
             this.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
         }
         this.packageManager = args.options.packageManager || 'npm';
-        this.shell = args.options.shell || 'bash';
+        this.shell = args.options.shell || 'powershell';
         if (this.supportedVersions.indexOf(this.toVersion) < 0) {
-            throw new CommandError(`CLI for Microsoft 365 doesn't support upgrading SharePoint Framework projects to version ${this.toVersion}. Supported versions are ${this.supportedVersions.join(', ')}`, _a.ERROR_UNSUPPORTED_TO_VERSION);
+            throw new CommandError(`CLI for Microsoft 365 doesn't support upgrading SharePoint Framework projects to version ${this.toVersion}. Supported versions are ${this.supportedVersions.join(', ')}`, SpfxProjectUpgradeCommand.ERROR_UNSUPPORTED_TO_VERSION);
         }
         this.projectVersion = this.getProjectVersion();
         if (!this.projectVersion) {
-            throw new CommandError(`Unable to determine the version of the current SharePoint Framework project`, _a.ERROR_NO_VERSION);
+            throw new CommandError(`Unable to determine the version of the current SharePoint Framework project`, SpfxProjectUpgradeCommand.ERROR_NO_VERSION);
         }
         const pos = this.supportedVersions.indexOf(this.projectVersion);
         if (pos < 0) {
-            throw new CommandError(`CLI for Microsoft 365 doesn't support upgrading projects built using SharePoint Framework v${this.projectVersion}`, _a.ERROR_UNSUPPORTED_FROM_VERSION);
+            throw new CommandError(`CLI for Microsoft 365 doesn't support upgrading projects built using SharePoint Framework v${this.projectVersion}`, SpfxProjectUpgradeCommand.ERROR_UNSUPPORTED_FROM_VERSION);
         }
         const posTo = this.supportedVersions.indexOf(this.toVersion);
         if (pos > posTo) {
-            throw new CommandError('You cannot downgrade a project', _a.ERROR_NO_DOWNGRADE);
+            throw new CommandError('You cannot downgrade a project', SpfxProjectUpgradeCommand.ERROR_NO_DOWNGRADE);
         }
         if (pos === posTo) {
             await logger.log(`Project doesn't need to be upgraded`);
@@ -479,53 +483,6 @@ ${f.resolution}
         };
     }
 }
-_a = SpfxProjectUpgradeCommand, _SpfxProjectUpgradeCommand_instances = new WeakSet(), _SpfxProjectUpgradeCommand_initTelemetry = function _SpfxProjectUpgradeCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            toVersion: args.options.toVersion || this.supportedVersions[this.supportedVersions.length - 1],
-            packageManager: args.options.packageManager || 'npm',
-            shell: args.options.shell || 'bash',
-            preview: args.options.preview
-        });
-        // uncomment to support upgrading to preview releases
-        if (prerelease(this.telemetryProperties.toVersion) && !args.options.preview) {
-            this.telemetryProperties.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
-        }
-    });
-}, _SpfxProjectUpgradeCommand_initOptions = function _SpfxProjectUpgradeCommand_initOptions() {
-    this.options.unshift({
-        option: '-v, --toVersion [toVersion]'
-    }, {
-        option: '--packageManager [packageManager]',
-        autocomplete: _a.packageManagers
-    }, {
-        option: '--shell [shell]',
-        autocomplete: _a.shells
-    }, {
-        option: '--preview'
-    });
-    this.options.forEach(o => {
-        if (o.option.indexOf('--output') > -1) {
-            o.autocomplete = this.allowedOutputs;
-        }
-    });
-}, _SpfxProjectUpgradeCommand_initValidators = function _SpfxProjectUpgradeCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.packageManager) {
-            if (_a.packageManagers.indexOf(args.options.packageManager) < 0) {
-                return `${args.options.packageManager} is not a supported package manager. Supported package managers are ${_a.packageManagers.join(', ')}`;
-            }
-        }
-        if (args.options.shell) {
-            if (_a.shells.indexOf(args.options.shell) < 0) {
-                return `${args.options.shell} is not a supported shell. Supported shells are ${_a.shells.join(', ')}`;
-            }
-        }
-        return true;
-    });
-};
-SpfxProjectUpgradeCommand.packageManagers = ['npm', 'pnpm', 'yarn'];
-SpfxProjectUpgradeCommand.shells = ['bash', 'powershell', 'cmd'];
 SpfxProjectUpgradeCommand.ERROR_NO_PROJECT_ROOT_FOLDER = 1;
 SpfxProjectUpgradeCommand.ERROR_UNSUPPORTED_TO_VERSION = 2;
 SpfxProjectUpgradeCommand.ERROR_NO_VERSION = 3;

package/dist/m365/spo/commands/file/file-move.js

@@ -35,9 +35,6 @@ class SpoFileMoveCommand extends SpoCommand {
             const sourceServerRelativePath = await this.getSourcePath(logger, args.options);
             const sourcePath = this.getAbsoluteUrl(args.options.webUrl, sourceServerRelativePath);
             const destinationPath = this.getAbsoluteUrl(args.options.webUrl, args.options.targetUrl);
-            if (args.options.includeItemPermissions) {
-                await this.warn(logger, `Parameter 'includeItemPermissions' is deprecated. Please use 'withItemPermissions' instead`);
-            }
             if (this.verbose) {
                 await logger.logToStderr(`Moving file '${sourceServerRelativePath}' to '${args.options.targetUrl}'...`);
             }
@@ -49,7 +46,7 @@ class SpoFileMoveCommand extends SpoCommand {
             const copyJobResponse = await spo.createFileCopyJob(args.options.webUrl, sourcePath, destinationPath, {
                 nameConflictBehavior: this.getNameConflictBehaviorValue(args.options.nameConflictBehavior),
                 bypassSharedLock: !!args.options.bypassSharedLock,
-                includeItemPermissions: !!args.options.includeItemPermissions || !!args.options.withItemPermissions,
+                includeItemPermissions: !!args.options.withItemPermissions,
                 newName: newName,
                 operation: 'move'
             });
@@ -121,7 +118,6 @@ _SpoFileMoveCommand_instances = new WeakSet(), _SpoFileMoveCommand_initTelemetry
             sourceId: typeof args.options.sourceId !== 'undefined',
             newName: typeof args.options.newName !== 'undefined',
             nameConflictBehavior: typeof args.options.nameConflictBehavior !== 'undefined',
-            includeItemPermissions: !!args.options.includeItemPermissions,
             withItemPermissions: !!args.options.withItemPermissions,
             bypassSharedLock: !!args.options.bypassSharedLock,
             skipWait: !!args.options.skipWait
@@ -141,8 +137,6 @@ _SpoFileMoveCommand_instances = new WeakSet(), _SpoFileMoveCommand_initTelemetry
     }, {
         option: '--nameConflictBehavior [nameConflictBehavior]',
         autocomplete: this.nameConflictBehaviorOptions
-    }, {
-        option: '--includeItemPermissions'
     }, {
         option: '--withItemPermissions'
     }, {
@@ -168,7 +162,7 @@ _SpoFileMoveCommand_instances = new WeakSet(), _SpoFileMoveCommand_initTelemetry
     this.optionSets.push({ options: ['sourceUrl', 'sourceId'] });
 }, _SpoFileMoveCommand_initTypes = function _SpoFileMoveCommand_initTypes() {
     this.types.string.push('webUrl', 'sourceUrl', 'sourceId', 'targetUrl', 'newName', 'nameConflictBehavior');
-    this.types.boolean.push('includeItemPermissions', 'withItemPermissions', 'bypassSharedLock', 'skipWait');
+    this.types.boolean.push('withItemPermissions', 'bypassSharedLock', 'skipWait');
 };
 export default new SpoFileMoveCommand();
 //# sourceMappingURL=file-move.js.map