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

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

@@ -30,6 +30,9 @@ 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'}...`);
         }
@@ -51,7 +54,7 @@ class EntraPimRoleRequestListCommand extends GraphCommand {
                 queryParameters.push(`$filter=${filters.join(' and ')}`);
             }
             expands.push('roleDefinition($select=displayName)');
-            if (args.options.withPrincipalDetails) {
+            if (args.options.includePrincipalDetails || args.options.withPrincipalDetails) {
                 expands.push('principal');
             }
             queryParameters.push(`$expand=${expands.join(',')}`);
@@ -100,6 +103,7 @@ _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
         });
     });
@@ -117,6 +121,8 @@ _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,29 +28,33 @@ 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, withSolutions } = args.options;
+            const { environmentName, asAdmin, sharingStatus, includeSolutions, withSolutions } = args.options;
             let items = [];
+            const shouldIncludeSolutions = withSolutions || includeSolutions;
             if (sharingStatus === 'personal') {
-                const url = this.getApiUrl(environmentName, asAdmin, withSolutions, 'personal');
+                const url = this.getApiUrl(environmentName, asAdmin, shouldIncludeSolutions, 'personal');
                 items = await odata.getAllItems(url);
             }
             else if (sharingStatus === 'sharedWithMe') {
-                const url = this.getApiUrl(environmentName, asAdmin, withSolutions, 'team');
+                const url = this.getApiUrl(environmentName, asAdmin, shouldIncludeSolutions, 'team');
                 items = await odata.getAllItems(url);
             }
             else if (sharingStatus === 'all') {
-                let url = this.getApiUrl(environmentName, asAdmin, withSolutions, 'personal');
+                let url = this.getApiUrl(environmentName, asAdmin, shouldIncludeSolutions, 'personal');
                 items = await odata.getAllItems(url);
-                url = this.getApiUrl(environmentName, asAdmin, withSolutions, 'team');
+                url = this.getApiUrl(environmentName, asAdmin, shouldIncludeSolutions, 'team');
                 const teamFlows = await odata.getAllItems(url);
                 items = items.concat(teamFlows);
             }
             else {
-                const url = this.getApiUrl(environmentName, asAdmin, withSolutions);
+                const url = this.getApiUrl(environmentName, asAdmin, shouldIncludeSolutions);
                 items = await odata.getAllItems(url);
             }
             // Remove duplicates
@@ -80,6 +84,7 @@ _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
         });
@@ -90,6 +95,8 @@ _FlowListCommand_instances = new WeakSet(), _FlowListCommand_initTelemetry = fun
     }, {
         option: '--sharingStatus [sharingStatus]',
         autocomplete: this.allowedSharingStatuses
+    }, {
+        option: '--includeSolutions'
     }, {
         option: '--withSolutions'
     }, {
@@ -107,7 +114,7 @@ _FlowListCommand_instances = new WeakSet(), _FlowListCommand_initTelemetry = fun
     });
 }, _FlowListCommand_initTypes = function _FlowListCommand_initTypes() {
     this.types.string.push('environmentName', 'sharingStatus');
-    this.types.boolean.push('withSolutions', 'asAdmin');
+    this.types.boolean.push('includeSolutions', 'withSolutions', 'asAdmin');
 };
 export default new FlowListCommand();
 //# sourceMappingURL=flow-list.js.map

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

@@ -27,6 +27,9 @@ 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`,
@@ -41,7 +44,7 @@ class FlowRunGetCommand extends PowerAutomateCommand {
             res.endTime = res.properties.endTime || '';
             res.status = res.properties.status;
             res.triggerName = res.properties.trigger.name;
-            if (args.options.withTrigger && res.properties.trigger.outputsLink) {
+            if ((args.options.includeTriggerInformation || args.options.withTrigger) && res.properties.trigger.outputsLink) {
                 res.triggerInformation = await this.getTriggerInformation(res);
             }
             if (!!args.options.withActions) {
@@ -93,6 +96,8 @@ _FlowRunGetCommand_instances = new WeakSet(), _FlowRunGetCommand_initOptions = f
         option: '--flowName <flowName>'
     }, {
         option: '-e, --environmentName <environmentName>'
+    }, {
+        option: '--includeTriggerInformation'
     }, {
         option: '--withTrigger'
     }, {
@@ -111,6 +116,7 @@ _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']))
 })
-    .passthrough();
+    .and(z.any());
 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, zod.schemaToOptions(this.schema));
+            const unknownOptions = optionsUtils.getUnknownOptions(args.options, this.options);
             const unknownOptionsNames = Object.getOwnPropertyNames(unknownOptions);
             unknownOptionsNames.forEach(async (o) => {
                 try {

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

@@ -13,10 +13,11 @@ const options = globalOptionsZod
     resourceType: zod.alias('t', z.enum(['user', 'group', 'device', 'organization'])),
     keepUnchangedProperties: zod.alias('k', z.boolean().optional())
 })
-    .passthrough();
+    .and(z.any());
 class GraphOpenExtensionSetCommand extends GraphCommand {
     constructor() {
         super(...arguments);
+        this.commandOptions = ['keepUnchangedProperties', 'resourceType', 'resourceId', 'name'];
         this.defaultOpenExtensionProperties = ['id', 'extensionName'];
     }
     get name() {
@@ -45,9 +46,12 @@ class GraphOpenExtensionSetCommand extends GraphCommand {
             const currentExtensionNames = Object.getOwnPropertyNames(currentExtension);
             const requestBody = {};
             requestBody["@odata.type"] = '#microsoft.graph.openTypeExtension';
-            const unknownOptions = optionsUtils.getUnknownOptions(args.options, zod.schemaToOptions(this.schema));
+            const unknownOptions = optionsUtils.getUnknownOptions(args.options, this.options);
             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,
+            includeResourceData: args.options.withResourceData || args.options.includeResourceData,
             encryptionCertificate: args.options.encryptionCertificate,
             encryptionCertificateId: args.options.encryptionCertificateId,
             lifecycleNotificationUrl: args.options.lifecycleNotificationUrl,
@@ -66,6 +66,9 @@ 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);
         }
@@ -132,6 +135,7 @@ _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'
@@ -156,6 +160,8 @@ _GraphSubscriptionAddCommand_instances = new WeakSet(), _GraphSubscriptionAddCom
     }, {
         option: '--latestTLSVersion [latestTLSVersion]',
         autocomplete: this.allowedTlsVersions
+    }, {
+        option: '--includeResourceData [includeResourceData]'
     }, {
         option: '--withResourceData [withResourceData]'
     }, {
@@ -187,10 +193,11 @@ _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(', ')}`;
         }
-        if (args.options.withResourceData && !args.options.encryptionCertificate) {
+        const shouldIncludeResourceData = args.options.includeResourceData || args.options.withResourceData;
+        if (shouldIncludeResourceData && !args.options.encryptionCertificate) {
             return `The 'encryptionCertificate' options is required to include the changed resource data`;
         }
-        if (args.options.withResourceData && !args.options.encryptionCertificateId) {
+        if (shouldIncludeResourceData && !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,13 +25,17 @@ 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${!args.options.withMicrosoftPublishers ? `&$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${!shouldIncludeMicrosoftPublishers ? `&$filter=publisherid ne 'd21aab70-79e7-11dd-8874-00188b01e34f'` : ''}&api-version=9.1`,
                 headers: {
                     accept: 'application/json;odata.metadata=none'
                 },
@@ -48,6 +52,7 @@ 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
         });
@@ -55,6 +60,8 @@ _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,11 +24,15 @@ 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}${args.options.withResults ? '?$expand=results' : ''}`,
+                url: `${this.resource}/v1.0/informationProtection/threatAssessmentRequests/${args.options.id}${shouldIncludeResults ? '?$expand=results' : ''}`,
                 headers: {
                     accept: 'application/json;odata.metadata=none'
                 },
@@ -52,6 +56,8 @@ _PurviewThreatAssessmentGetCommand_instances = new WeakSet(), _PurviewThreatAsse
 }, _PurviewThreatAssessmentGetCommand_initOptions = function _PurviewThreatAssessmentGetCommand_initOptions() {
     this.options.unshift({
         option: '-i, --id <id>'
+    }, {
+        option: '--includeResults'
     }, {
         option: '--withResults'
     });

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

@@ -35,6 +35,9 @@ 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}'...`);
             }
@@ -46,7 +49,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.withItemPermissions,
+                includeItemPermissions: !!args.options.includeItemPermissions || !!args.options.withItemPermissions,
                 newName: newName,
                 operation: 'move'
             });
@@ -118,6 +121,7 @@ _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
@@ -137,6 +141,8 @@ _SpoFileMoveCommand_instances = new WeakSet(), _SpoFileMoveCommand_initTelemetry
     }, {
         option: '--nameConflictBehavior [nameConflictBehavior]',
         autocomplete: this.nameConflictBehaviorOptions
+    }, {
+        option: '--includeItemPermissions'
     }, {
         option: '--withItemPermissions'
     }, {
@@ -162,7 +168,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('withItemPermissions', 'bypassSharedLock', 'skipWait');
+    this.types.boolean.push('includeItemPermissions', 'withItemPermissions', 'bypassSharedLock', 'skipWait');
 };
 export default new SpoFileMoveCommand();
 //# sourceMappingURL=file-move.js.map

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

@@ -29,12 +29,20 @@ 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.withAssociatedSites && (args.options.output && args.options.output !== 'json')) {
-                throw 'withAssociatedSites option is only allowed with json output mode';
+            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 === true && args.options.output && !cli.shouldTrimOutput(args.options.output)) {
+            if ((args.options.includeAssociatedSites === true || 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);
@@ -100,11 +108,12 @@ _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: '--withAssociatedSites' });
+    this.options.unshift({ option: '-i, --id [id]' }, { option: '-t, --title [title]' }, { option: '-u, --url [url]' }, { option: '--includeAssociatedSites' }, { 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,10 +29,14 @@ 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;
-            if (!(args.options.withAssociatedSites !== true || args.options.output && args.options.output !== 'json')) {
+            const shouldIncludeAssociatedSites = args.options.includeAssociatedSites || args.options.withAssociatedSites;
+            if (!(shouldIncludeAssociatedSites !== true || args.options.output && args.options.output !== 'json')) {
                 if (this.debug) {
                     await logger.logToStderr('Retrieving associated sites...');
                     await logger.logToStderr('');
@@ -104,11 +108,14 @@ 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/SPOTenantSitePropertiesEnumerable.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=SPOTenantSitePropertiesEnumerable.js.map

package/dist/m365/spo/commands/tenant/TenantSiteProperties.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=TenantSiteProperties.js.map

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

package/dist/m365/spo/commands/{site/site-list.js → tenant/tenant-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 _SpoSiteListCommand_instances, _SpoSiteListCommand_initTelemetry, _SpoSiteListCommand_initOptions, _SpoSiteListCommand_initValidators;
+var _SpoTenantSiteListCommand_instances, _SpoTenantSiteListCommand_initTelemetry, _SpoTenantSiteListCommand_initOptions, _SpoTenantSiteListCommand_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 SpoSiteListCommand extends SpoCommand {
+class SpoTenantSiteListCommand extends SpoCommand {
     get name() {
-        return commands.SITE_LIST;
+        return commands.TENANT_SITE_LIST;
     }
     get description() {
         return 'Lists sites of the given type';
@@ -22,17 +22,20 @@ class SpoSiteListCommand extends SpoCommand {
     }
     constructor() {
         super();
-        _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);
+        _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);
     }
     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.withOneDriveSites || false;
+        const includeOneDriveSites = (args.options.includeOneDriveSites || args.options.withOneDriveSites) || false;
         const personalSite = includeOneDriveSites === false ? '0' : '1';
         try {
             const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
@@ -76,7 +79,7 @@ class SpoSiteListCommand extends SpoCommand {
         if (options.webTemplate) {
             return options.webTemplate;
         }
-        if (options.withOneDriveSites) {
+        if (options.includeOneDriveSites || options.withOneDriveSites) {
             return '';
         }
         switch (options.type) {
@@ -89,16 +92,17 @@ class SpoSiteListCommand extends SpoCommand {
         }
     }
 }
-_SpoSiteListCommand_instances = new WeakSet(), _SpoSiteListCommand_initTelemetry = function _SpoSiteListCommand_initTelemetry() {
+_SpoTenantSiteListCommand_instances = new WeakSet(), _SpoTenantSiteListCommand_initTelemetry = function _SpoTenantSiteListCommand_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'
         });
     });
-}, _SpoSiteListCommand_initOptions = function _SpoSiteListCommand_initOptions() {
+}, _SpoTenantSiteListCommand_initOptions = function _SpoTenantSiteListCommand_initOptions() {
     this.options.unshift({
         option: '-t, --type [type]',
         autocomplete: ['TeamSite', 'CommunicationSite']
@@ -106,10 +110,12 @@ _SpoSiteListCommand_instances = new WeakSet(), _SpoSiteListCommand_initTelemetry
         option: '--webTemplate [webTemplate]'
     }, {
         option: '--filter [filter]'
+    }, {
+        option: '--includeOneDriveSites'
     }, {
         option: '--withOneDriveSites'
     });
-}, _SpoSiteListCommand_initValidators = function _SpoSiteListCommand_initValidators() {
+}, _SpoTenantSiteListCommand_initValidators = function _SpoTenantSiteListCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.type && args.options.webTemplate) {
             return 'Specify either type or webTemplate, but not both';
@@ -119,12 +125,17 @@ _SpoSiteListCommand_instances = new WeakSet(), _SpoSiteListCommand_initTelemetry
             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.withOneDriveSites
+        if (args.options.includeOneDriveSites || args.options.withOneDriveSites
             && (args.options.type || args.options.webTemplate)) {
-            return 'When using withOneDriveSites, don\'t specify the type or webTemplate options';
+            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 true;
     });
 };
-export default new SpoSiteListCommand();
-//# sourceMappingURL=site-list.js.map
+export default new SpoTenantSiteListCommand();
+//# sourceMappingURL=tenant-site-list.js.map