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

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/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

package/dist/m365/spo/commands/homesite/homesite-add.js

@@ -6,16 +6,18 @@ import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
 import request from '../../../../request.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 const options = globalOptionsZod
     .extend({
     url: zod.alias('u', z.string()
         .refine((url) => validation.isValidSharePointUrl(url) === true, url => ({
         message: `'${url}' is not a valid SharePoint Online site URL.`
     }))),
-    audiences: z.string()
+    audienceIds: z.string()
         .refine(audiences => validation.isValidGuidArray(audiences) === true, audiences => ({
         message: `The following GUIDs are invalid: ${validation.isValidGuidArray(audiences)}.`
     })).optional(),
+    audienceNames: z.string().optional(),
     vivaConnectionsDefaultStart: z.boolean().optional(),
     isInDraftMode: z.boolean().optional(),
     order: z.number()
@@ -34,7 +36,20 @@ class SpoHomeSiteAddCommand extends SpoCommand {
     get schema() {
         return options;
     }
+    getRefinedSchema(schema) {
+        return schema
+            .refine((options) => [options.audienceIds, options.audienceNames].filter(o => o !== undefined).length <= 1, {
+            message: 'You must specify either audienceIds or audienceNames but not both.'
+        });
+    }
     async commandAction(logger, args) {
+        let audiences = [];
+        if (args.options.audienceIds) {
+            audiences = args.options.audienceIds.split(',').map(id => id.trim());
+        }
+        else if (args.options.audienceNames) {
+            audiences = await this.transformAudienceNamesToIds(args.options.audienceNames);
+        }
         try {
             const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.verbose);
             const requestOptions = {
@@ -45,7 +60,7 @@ class SpoHomeSiteAddCommand extends SpoCommand {
                 responseType: 'json',
                 data: {
                     siteUrl: args.options.url,
-                    audiences: args.options.audiences?.split(','),
+                    audiences: audiences,
                     vivaConnectionsDefaultStart: args.options.vivaConnectionsDefaultStart ?? true,
                     isInDraftMode: args.options.isInDraftMode ?? false,
                     order: args.options.order
@@ -61,6 +76,15 @@ class SpoHomeSiteAddCommand extends SpoCommand {
             this.handleRejectedODataJsonPromise(err);
         }
     }
+    async transformAudienceNamesToIds(audienceNames) {
+        const names = audienceNames.split(',');
+        const ids = [];
+        for (const name of names) {
+            const id = await entraGroup.getGroupIdByDisplayName(name.trim());
+            ids.push(id);
+        }
+        return ids;
+    }
 }
 export default new SpoHomeSiteAddCommand();
 //# sourceMappingURL=homesite-add.js.map

package/dist/m365/spo/commands/hubsite/hubsite-get.js

@@ -29,20 +29,12 @@ class SpoHubSiteGetCommand extends SpoCommand {
     }
     async commandAction(logger, args) {
         try {
-            if (args.options.includeAssociatedSites) {
-                await this.warn(logger, `Parameter 'includeAssociatedSites' is deprecated. Please use 'withAssociatedSites' instead`);
-            }
             const spoUrl = await spo.getSpoUrl(logger, this.debug);
             const hubSite = args.options.id ? await this.getHubSiteById(spoUrl, args.options) : await this.getHubSite(spoUrl, args.options);
-            if ((args.options.includeAssociatedSites || args.options.withAssociatedSites) && (args.options.output && args.options.output !== 'json')) {
-                if (args.options.includeAssociatedSites) {
-                    throw 'includeAssociatedSites option is only allowed with json output mode';
-                }
-                else {
-                    throw 'withAssociatedSites option is only allowed with json output mode';
-                }
+            if (args.options.withAssociatedSites && (args.options.output && args.options.output !== 'json')) {
+                throw 'withAssociatedSites option is only allowed with json output mode';
             }
-            if ((args.options.includeAssociatedSites === true || args.options.withAssociatedSites === true) && args.options.output && !cli.shouldTrimOutput(args.options.output)) {
+            if (args.options.withAssociatedSites === true && args.options.output && !cli.shouldTrimOutput(args.options.output)) {
                 const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
                 const associatedSitesCommandOutput = await this.getAssociatedSites(spoAdminUrl, hubSite.SiteId, logger, args);
                 const associatedSites = JSON.parse(associatedSitesCommandOutput.stdout);
@@ -108,12 +100,11 @@ _SpoHubSiteGetCommand_instances = new WeakSet(), _SpoHubSiteGetCommand_initTelem
             id: typeof args.options.id !== 'undefined',
             title: typeof args.options.title !== 'undefined',
             url: typeof args.options.url !== 'undefined',
-            includeAssociatedSites: args.options.includeAssociatedSites === true,
             withAssociatedSites: args.options.withAssociatedSites === true
         });
     });
 }, _SpoHubSiteGetCommand_initOptions = function _SpoHubSiteGetCommand_initOptions() {
-    this.options.unshift({ option: '-i, --id [id]' }, { option: '-t, --title [title]' }, { option: '-u, --url [url]' }, { option: '--includeAssociatedSites' }, { option: '--withAssociatedSites' });
+    this.options.unshift({ option: '-i, --id [id]' }, { option: '-t, --title [title]' }, { option: '-u, --url [url]' }, { option: '--withAssociatedSites' });
 }, _SpoHubSiteGetCommand_initValidators = function _SpoHubSiteGetCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.id && !validation.isValidGuid(args.options.id)) {

package/dist/m365/spo/commands/hubsite/hubsite-list.js

@@ -29,14 +29,10 @@ class SpoHubSiteListCommand extends SpoCommand {
     }
     async commandAction(logger, args) {
         try {
-            if (args.options.includeAssociatedSites) {
-                await this.warn(logger, `Parameter 'includeAssociatedSites' is deprecated. Please use 'withAssociatedSites' instead`);
-            }
             const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
             const hubSitesResult = await odata.getAllItems(`${spoAdminUrl}/_api/hubsites`);
             const hubSites = hubSitesResult;
-            const shouldIncludeAssociatedSites = args.options.includeAssociatedSites || args.options.withAssociatedSites;
-            if (!(shouldIncludeAssociatedSites !== true || args.options.output && args.options.output !== 'json')) {
+            if (!(args.options.withAssociatedSites !== true || args.options.output && args.options.output !== 'json')) {
                 if (this.debug) {
                     await logger.logToStderr('Retrieving associated sites...');
                     await logger.logToStderr('');
@@ -108,14 +104,11 @@ class SpoHubSiteListCommand extends SpoCommand {
 _SpoHubSiteListCommand_instances = new WeakSet(), _SpoHubSiteListCommand_initTelemetry = function _SpoHubSiteListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            includeAssociatedSites: args.options.includeAssociatedSites === true,
             withAssociatedSites: args.options.withAssociatedSites === true
         });
     });
 }, _SpoHubSiteListCommand_initOptions = function _SpoHubSiteListCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --includeAssociatedSites'
-    }, {
         option: '--withAssociatedSites'
     });
 };

package/dist/m365/spo/commands/{tenant/tenant-site-archive.js → site/site-archive.js}

@@ -3,7 +3,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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 _SpoTenantSiteArchiveCommand_instances, _SpoTenantSiteArchiveCommand_initTelemetry, _SpoTenantSiteArchiveCommand_initOptions, _SpoTenantSiteArchiveCommand_initValidators, _SpoTenantSiteArchiveCommand_initTypes;
+var _SpoSiteArchiveCommand_instances, _SpoSiteArchiveCommand_initTelemetry, _SpoSiteArchiveCommand_initOptions, _SpoSiteArchiveCommand_initValidators, _SpoSiteArchiveCommand_initTypes;
 import { cli } from '../../../../cli/cli.js';
 import config from '../../../../config.js';
 import request from '../../../../request.js';
@@ -11,20 +11,20 @@ import { validation } from '../../../../utils/validation.js';
 import { spo } from '../../../../utils/spo.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
-class SpoTenantSiteArchiveCommand extends SpoCommand {
+class SpoSiteArchiveCommand extends SpoCommand {
     get name() {
-        return commands.TENANT_SITE_ARCHIVE;
+        return commands.SITE_ARCHIVE;
     }
     get description() {
         return 'Archives a site collection';
     }
     constructor() {
         super();
-        _SpoTenantSiteArchiveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoTenantSiteArchiveCommand_instances, "m", _SpoTenantSiteArchiveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoTenantSiteArchiveCommand_instances, "m", _SpoTenantSiteArchiveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoTenantSiteArchiveCommand_instances, "m", _SpoTenantSiteArchiveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoTenantSiteArchiveCommand_instances, "m", _SpoTenantSiteArchiveCommand_initTypes).call(this);
+        _SpoSiteArchiveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoSiteArchiveCommand_instances, "m", _SpoSiteArchiveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoSiteArchiveCommand_instances, "m", _SpoSiteArchiveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoSiteArchiveCommand_instances, "m", _SpoSiteArchiveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoSiteArchiveCommand_instances, "m", _SpoSiteArchiveCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         const archiveSite = async () => {
@@ -81,19 +81,19 @@ class SpoTenantSiteArchiveCommand extends SpoCommand {
         }
     }
 }
-_SpoTenantSiteArchiveCommand_instances = new WeakSet(), _SpoTenantSiteArchiveCommand_initTelemetry = function _SpoTenantSiteArchiveCommand_initTelemetry() {
+_SpoSiteArchiveCommand_instances = new WeakSet(), _SpoSiteArchiveCommand_initTelemetry = function _SpoSiteArchiveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             force: !!args.options.force
         });
     });
-}, _SpoTenantSiteArchiveCommand_initOptions = function _SpoTenantSiteArchiveCommand_initOptions() {
+}, _SpoSiteArchiveCommand_initOptions = function _SpoSiteArchiveCommand_initOptions() {
     this.options.unshift({ option: '-u, --url <url>' }, { option: '-f, --force' });
-}, _SpoTenantSiteArchiveCommand_initValidators = function _SpoTenantSiteArchiveCommand_initValidators() {
+}, _SpoSiteArchiveCommand_initValidators = function _SpoSiteArchiveCommand_initValidators() {
     this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.url));
-}, _SpoTenantSiteArchiveCommand_initTypes = function _SpoTenantSiteArchiveCommand_initTypes() {
+}, _SpoSiteArchiveCommand_initTypes = function _SpoSiteArchiveCommand_initTypes() {
     this.types.string.push('url');
     this.types.boolean.push('force');
 };
-export default new SpoTenantSiteArchiveCommand();
-//# sourceMappingURL=tenant-site-archive.js.map
+export default new SpoSiteArchiveCommand();
+//# sourceMappingURL=site-archive.js.map

package/dist/m365/spo/commands/{tenant/tenant-site-list.js → site/site-list.js}

@@ -3,16 +3,16 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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 _SpoTenantSiteListCommand_instances, _SpoTenantSiteListCommand_initTelemetry, _SpoTenantSiteListCommand_initOptions, _SpoTenantSiteListCommand_initValidators;
+var _SpoSiteListCommand_instances, _SpoSiteListCommand_initTelemetry, _SpoSiteListCommand_initOptions, _SpoSiteListCommand_initValidators;
 import config from '../../../../config.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
-class SpoTenantSiteListCommand extends SpoCommand {
+class SpoSiteListCommand extends SpoCommand {
     get name() {
-        return commands.TENANT_SITE_LIST;
+        return commands.SITE_LIST;
     }
     get description() {
         return 'Lists sites of the given type';
@@ -22,20 +22,17 @@ class SpoTenantSiteListCommand extends SpoCommand {
     }
     constructor() {
         super();
-        _SpoTenantSiteListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoTenantSiteListCommand_instances, "m", _SpoTenantSiteListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoTenantSiteListCommand_instances, "m", _SpoTenantSiteListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoTenantSiteListCommand_instances, "m", _SpoTenantSiteListCommand_initValidators).call(this);
+        _SpoSiteListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoSiteListCommand_instances, "m", _SpoSiteListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoSiteListCommand_instances, "m", _SpoSiteListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoSiteListCommand_instances, "m", _SpoSiteListCommand_initValidators).call(this);
     }
     alias() {
         return [commands.SITE_LIST];
     }
     async commandAction(logger, args) {
-        if (args.options.includeOneDriveSites) {
-            await this.warn(logger, `Parameter 'includeOneDriveSites' is deprecated. Please use 'withOneDriveSites' instead`);
-        }
         const webTemplate = this.getWebTemplateId(args.options);
-        const includeOneDriveSites = (args.options.includeOneDriveSites || args.options.withOneDriveSites) || false;
+        const includeOneDriveSites = args.options.withOneDriveSites || false;
         const personalSite = includeOneDriveSites === false ? '0' : '1';
         try {
             const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
@@ -79,7 +76,7 @@ class SpoTenantSiteListCommand extends SpoCommand {
         if (options.webTemplate) {
             return options.webTemplate;
         }
-        if (options.includeOneDriveSites || options.withOneDriveSites) {
+        if (options.withOneDriveSites) {
             return '';
         }
         switch (options.type) {
@@ -92,17 +89,16 @@ class SpoTenantSiteListCommand extends SpoCommand {
         }
     }
 }
-_SpoTenantSiteListCommand_instances = new WeakSet(), _SpoTenantSiteListCommand_initTelemetry = function _SpoTenantSiteListCommand_initTelemetry() {
+_SpoSiteListCommand_instances = new WeakSet(), _SpoSiteListCommand_initTelemetry = function _SpoSiteListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             webTemplate: args.options.webTemplate,
             type: args.options.type,
             filter: (!(!args.options.filter)).toString(),
-            includeOneDriveSites: typeof args.options.includeOneDriveSites !== 'undefined',
             withOneDriveSites: typeof args.options.withOneDriveSites !== 'undefined'
         });
     });
-}, _SpoTenantSiteListCommand_initOptions = function _SpoTenantSiteListCommand_initOptions() {
+}, _SpoSiteListCommand_initOptions = function _SpoSiteListCommand_initOptions() {
     this.options.unshift({
         option: '-t, --type [type]',
         autocomplete: ['TeamSite', 'CommunicationSite']
@@ -110,12 +106,10 @@ _SpoTenantSiteListCommand_instances = new WeakSet(), _SpoTenantSiteListCommand_i
         option: '--webTemplate [webTemplate]'
     }, {
         option: '--filter [filter]'
-    }, {
-        option: '--includeOneDriveSites'
     }, {
         option: '--withOneDriveSites'
     });
-}, _SpoTenantSiteListCommand_initValidators = function _SpoTenantSiteListCommand_initValidators() {
+}, _SpoSiteListCommand_initValidators = function _SpoSiteListCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.type && args.options.webTemplate) {
             return 'Specify either type or webTemplate, but not both';
@@ -125,17 +119,12 @@ _SpoTenantSiteListCommand_instances = new WeakSet(), _SpoTenantSiteListCommand_i
             typeValues.indexOf(args.options.type) < 0) {
             return `${args.options.type} is not a valid value for the type option. Allowed values are ${typeValues.join('|')}`;
         }
-        if (args.options.includeOneDriveSites || args.options.withOneDriveSites
+        if (args.options.withOneDriveSites
             && (args.options.type || args.options.webTemplate)) {
-            if (args.options.includeOneDriveSites) {
-                return 'When using includeOneDriveSites, don\'t specify the type or webTemplate options';
-            }
-            else {
-                return 'When using withOneDriveSites, don\'t specify the type or webTemplate options';
-            }
+            return 'When using withOneDriveSites, don\'t specify the type or webTemplate options';
         }
         return true;
     });
 };
-export default new SpoTenantSiteListCommand();
-//# sourceMappingURL=tenant-site-list.js.map
+export default new SpoSiteListCommand();
+//# sourceMappingURL=site-list.js.map