@pnp/cli-microsoft365 11.0.0-beta.3d99ea3 → 11.0.0-beta.4abfd23

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/list/list-view-add.js

@@ -114,7 +114,7 @@ class SpoListViewAddCommand extends SpoCommand {
                         Query: args.options.viewQuery,
                         PersonalView: !!args.options.personal,
                         SetAsDefaultView: !!args.options.default,
-                        Paged: !!args.options.paged,
+                        Paged: args.options.paged ?? true,
                         RowLimit: args.options.rowLimit ?? 30,
                         CustomFormatter: args.options.customFormatter
                     }

package/dist/m365/spo/commands/serviceprincipal/serviceprincipal-grant-list.js

@@ -1,9 +1,11 @@
-import config from '../../../../config.js';
 import request from '../../../../request.js';
-import { spo } from '../../../../utils/spo.js';
-import SpoCommand from '../../../base/SpoCommand.js';
+import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-class SpoServicePrincipalGrantListCommand extends SpoCommand {
+class SpoServicePrincipalGrantListCommand extends GraphCommand {
+    constructor() {
+        super(...arguments);
+        this.spoServicePrincipalDisplayName = 'SharePoint Online Web Client Extensibility';
+    }
     get name() {
         return commands.SERVICEPRINCIPAL_GRANT_LIST;
     }
@@ -15,36 +17,26 @@ class SpoServicePrincipalGrantListCommand extends SpoCommand {
     }
     async commandAction(logger) {
         try {
-            const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
             if (this.verbose) {
-                await logger.logToStderr(`Retrieving request digest...`);
+                await logger.logToStderr(`Retrieving permissions granted to the service principal '${this.spoServicePrincipalDisplayName}'...`);
             }
-            const reqDigest = await spo.getRequestDigest(spoAdminUrl);
             const requestOptions = {
-                url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                url: `${this.resource}/v1.0/servicePrincipals?$filter=displayName eq '${this.spoServicePrincipalDisplayName}'&$select=id`,
                 headers: {
-                    'X-RequestDigest': reqDigest.FormDigestValue
+                    accept: 'application/json;odata.metadata=none'
                 },
-                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="4" ObjectPathId="3" /><ObjectPath Id="6" ObjectPathId="5" /><Query Id="7" ObjectPathId="5"><Query SelectAllProperties="true"><Properties /></Query><ChildItemQuery SelectAllProperties="true"><Properties /></ChildItemQuery></Query></Actions><ObjectPaths><Constructor Id="3" TypeId="{104e8f06-1e00-4675-99c6-1b9b504ed8d8}" /><Property Id="5" ParentId="3" Name="PermissionGrants" /></ObjectPaths></Request>`
+                responseType: 'json'
             };
-            const res = await request.post(requestOptions);
-            const json = JSON.parse(res);
-            const response = json[0];
-            if (response.ErrorInfo) {
-                throw response.ErrorInfo.ErrorMessage;
-            }
-            else {
-                const result = json[json.length - 1]._Child_Items_;
-                await logger.log(result.map(r => {
-                    delete r._ObjectType_;
-                    delete r.ClientId;
-                    delete r.ConsentType;
-                    return r;
-                }));
+            const response = await request.get(requestOptions);
+            if (response.value.length === 0) {
+                throw `Service principal '${this.spoServicePrincipalDisplayName}' not found`;
             }
+            requestOptions.url = `${this.resource}/v1.0/servicePrincipals/${response.value[0].id}/oauth2PermissionGrants`;
+            const result = await request.get(requestOptions);
+            await logger.log(result.value);
         }
         catch (err) {
-            this.handleRejectedPromise(err);
+            this.handleRejectedODataJsonPromise(err);
         }
     }
 }

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

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

@@ -3,15 +3,15 @@ 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 _SpoTenantSiteMembershipListCommand_instances, _a, _SpoTenantSiteMembershipListCommand_initTelemetry, _SpoTenantSiteMembershipListCommand_initOptions, _SpoTenantSiteMembershipListCommand_initValidators, _SpoTenantSiteMembershipListCommand_initTypes;
+var _SpoSiteMembershipListCommand_instances, _a, _SpoSiteMembershipListCommand_initTelemetry, _SpoSiteMembershipListCommand_initOptions, _SpoSiteMembershipListCommand_initValidators, _SpoSiteMembershipListCommand_initTypes;
 import { odata } from '../../../../utils/odata.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 SpoTenantSiteMembershipListCommand extends SpoCommand {
+class SpoSiteMembershipListCommand extends SpoCommand {
     get name() {
-        return commands.TENANT_SITE_MEMBERSHIP_LIST;
+        return commands.SITE_MEMBERSHIP_LIST;
     }
     get description() {
         return `Retrieves information about default site groups' membership`;
@@ -21,11 +21,11 @@ class SpoTenantSiteMembershipListCommand extends SpoCommand {
     }
     constructor() {
         super();
-        _SpoTenantSiteMembershipListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoTenantSiteMembershipListCommand_instances, "m", _SpoTenantSiteMembershipListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoTenantSiteMembershipListCommand_instances, "m", _SpoTenantSiteMembershipListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoTenantSiteMembershipListCommand_instances, "m", _SpoTenantSiteMembershipListCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoTenantSiteMembershipListCommand_instances, "m", _SpoTenantSiteMembershipListCommand_initTypes).call(this);
+        _SpoSiteMembershipListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoSiteMembershipListCommand_instances, "m", _SpoSiteMembershipListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoSiteMembershipListCommand_instances, "m", _SpoSiteMembershipListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoSiteMembershipListCommand_instances, "m", _SpoSiteMembershipListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoSiteMembershipListCommand_instances, "m", _SpoSiteMembershipListCommand_initTypes).call(this);
     }
     ;
     async commandAction(logger, args) {
@@ -90,29 +90,29 @@ class SpoTenantSiteMembershipListCommand extends SpoCommand {
         }
     }
 }
-_a = SpoTenantSiteMembershipListCommand, _SpoTenantSiteMembershipListCommand_instances = new WeakSet(), _SpoTenantSiteMembershipListCommand_initTelemetry = function _SpoTenantSiteMembershipListCommand_initTelemetry() {
+_a = SpoSiteMembershipListCommand, _SpoSiteMembershipListCommand_instances = new WeakSet(), _SpoSiteMembershipListCommand_initTelemetry = function _SpoSiteMembershipListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             role: typeof args.options.role !== 'undefined'
         });
     });
-}, _SpoTenantSiteMembershipListCommand_initOptions = function _SpoTenantSiteMembershipListCommand_initOptions() {
+}, _SpoSiteMembershipListCommand_initOptions = function _SpoSiteMembershipListCommand_initOptions() {
     this.options.unshift({
         option: '-u, --siteUrl <siteUrl>'
     }, {
         option: '-r, --role [role]',
         autocomplete: _a.RoleNames
     });
-}, _SpoTenantSiteMembershipListCommand_initValidators = function _SpoTenantSiteMembershipListCommand_initValidators() {
+}, _SpoSiteMembershipListCommand_initValidators = function _SpoSiteMembershipListCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.role && !_a.RoleNames.some(roleName => roleName.toLocaleLowerCase() === args.options.role.toLocaleLowerCase())) {
             return `'${args.options.role}' is not a valid value for option 'role'. Valid values are: ${_a.RoleNames.join(', ')}`;
         }
         return validation.isValidSharePointUrl(args.options.siteUrl);
     });
-}, _SpoTenantSiteMembershipListCommand_initTypes = function _SpoTenantSiteMembershipListCommand_initTypes() {
+}, _SpoSiteMembershipListCommand_initTypes = function _SpoSiteMembershipListCommand_initTypes() {
     this.types.string.push('role', 'siteUrl');
 };
-SpoTenantSiteMembershipListCommand.RoleNames = ['Owner', 'Member', 'Visitor'];
-export default new SpoTenantSiteMembershipListCommand();
-//# sourceMappingURL=tenant-site-membership-list.js.map
+SpoSiteMembershipListCommand.RoleNames = ['Owner', 'Member', 'Visitor'];
+export default new SpoSiteMembershipListCommand();
+//# sourceMappingURL=site-membership-list.js.map

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

@@ -3,26 +3,26 @@ 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 _SpoTenantSiteRenameCommand_instances, _SpoTenantSiteRenameCommand_initTelemetry, _SpoTenantSiteRenameCommand_initOptions, _SpoTenantSiteRenameCommand_initValidators;
+var _SpoSiteRenameCommand_instances, _SpoSiteRenameCommand_initTelemetry, _SpoSiteRenameCommand_initOptions, _SpoSiteRenameCommand_initValidators;
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
 import { timersUtil } from '../../../../utils/timersUtil.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
-class SpoTenantSiteRenameCommand extends SpoCommand {
+class SpoSiteRenameCommand extends SpoCommand {
     get name() {
-        return commands.TENANT_SITE_RENAME;
+        return commands.SITE_RENAME;
     }
     get description() {
         return 'Renames the URL and title of a site collection';
     }
     constructor() {
         super();
-        _SpoTenantSiteRenameCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoTenantSiteRenameCommand_instances, "m", _SpoTenantSiteRenameCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoTenantSiteRenameCommand_instances, "m", _SpoTenantSiteRenameCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoTenantSiteRenameCommand_instances, "m", _SpoTenantSiteRenameCommand_initValidators).call(this);
+        _SpoSiteRenameCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoSiteRenameCommand_instances, "m", _SpoSiteRenameCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoSiteRenameCommand_instances, "m", _SpoSiteRenameCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoSiteRenameCommand_instances, "m", _SpoSiteRenameCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
         try {
@@ -92,11 +92,11 @@ class SpoTenantSiteRenameCommand extends SpoCommand {
         if (this.operationData.JobState === "Success") {
             return;
         }
-        await timersUtil.setTimeout(SpoTenantSiteRenameCommand.checkIntervalInMs);
+        await timersUtil.setTimeout(SpoSiteRenameCommand.checkIntervalInMs);
         await command.waitForRenameCompletion(command, isVerbose, spoAdminUrl, siteUrl, iteration);
     }
 }
-_SpoTenantSiteRenameCommand_instances = new WeakSet(), _SpoTenantSiteRenameCommand_initTelemetry = function _SpoTenantSiteRenameCommand_initTelemetry() {
+_SpoSiteRenameCommand_instances = new WeakSet(), _SpoSiteRenameCommand_initTelemetry = function _SpoSiteRenameCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             newTitle: typeof args.options.newTitle !== 'undefined',
@@ -105,7 +105,7 @@ _SpoTenantSiteRenameCommand_instances = new WeakSet(), _SpoTenantSiteRenameComma
             wait: !!args.options.wait
         });
     });
-}, _SpoTenantSiteRenameCommand_initOptions = function _SpoTenantSiteRenameCommand_initOptions() {
+}, _SpoSiteRenameCommand_initOptions = function _SpoSiteRenameCommand_initOptions() {
     this.options.unshift({
         option: '-u, --url <url>'
     }, {
@@ -119,7 +119,7 @@ _SpoTenantSiteRenameCommand_instances = new WeakSet(), _SpoTenantSiteRenameComma
     }, {
         option: '--wait'
     });
-}, _SpoTenantSiteRenameCommand_initValidators = function _SpoTenantSiteRenameCommand_initValidators() {
+}, _SpoSiteRenameCommand_initValidators = function _SpoSiteRenameCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.url.toLowerCase() === args.options.newUrl.toLowerCase()) {
             return 'The new URL cannot be the same as the target URL.';
@@ -127,6 +127,6 @@ _SpoTenantSiteRenameCommand_instances = new WeakSet(), _SpoTenantSiteRenameComma
         return true;
     });
 };
-SpoTenantSiteRenameCommand.checkIntervalInMs = 5000;
-export default new SpoTenantSiteRenameCommand();
-//# sourceMappingURL=tenant-site-rename.js.map
+SpoSiteRenameCommand.checkIntervalInMs = 5000;
+export default new SpoSiteRenameCommand();
+//# sourceMappingURL=site-rename.js.map

package/dist/m365/spo/commands/{tenant/tenant-site-unarchive.js → site/site-unarchive.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 _SpoTenantSiteUnarchiveCommand_instances, _SpoTenantSiteUnarchiveCommand_initTelemetry, _SpoTenantSiteUnarchiveCommand_initOptions, _SpoTenantSiteUnarchiveCommand_initValidators, _SpoTenantSiteUnarchiveCommand_initTypes;
+var _SpoSiteUnarchiveCommand_instances, _SpoSiteUnarchiveCommand_initTelemetry, _SpoSiteUnarchiveCommand_initOptions, _SpoSiteUnarchiveCommand_initValidators, _SpoSiteUnarchiveCommand_initTypes;
 import { cli } from '../../../../cli/cli.js';
 import config from '../../../../config.js';
 import request from '../../../../request.js';
@@ -11,20 +11,20 @@ import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
-class SpoTenantSiteUnarchiveCommand extends SpoCommand {
+class SpoSiteUnarchiveCommand extends SpoCommand {
     get name() {
-        return commands.TENANT_SITE_UNARCHIVE;
+        return commands.SITE_UNARCHIVE;
     }
     get description() {
         return 'Unarchives a site collection';
     }
     constructor() {
         super();
-        _SpoTenantSiteUnarchiveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoTenantSiteUnarchiveCommand_instances, "m", _SpoTenantSiteUnarchiveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoTenantSiteUnarchiveCommand_instances, "m", _SpoTenantSiteUnarchiveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoTenantSiteUnarchiveCommand_instances, "m", _SpoTenantSiteUnarchiveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoTenantSiteUnarchiveCommand_instances, "m", _SpoTenantSiteUnarchiveCommand_initTypes).call(this);
+        _SpoSiteUnarchiveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoSiteUnarchiveCommand_instances, "m", _SpoSiteUnarchiveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoSiteUnarchiveCommand_instances, "m", _SpoSiteUnarchiveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoSiteUnarchiveCommand_instances, "m", _SpoSiteUnarchiveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoSiteUnarchiveCommand_instances, "m", _SpoSiteUnarchiveCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         if (args.options.force) {
@@ -76,23 +76,23 @@ class SpoTenantSiteUnarchiveCommand extends SpoCommand {
         }
     }
 }
-_SpoTenantSiteUnarchiveCommand_instances = new WeakSet(), _SpoTenantSiteUnarchiveCommand_initTelemetry = function _SpoTenantSiteUnarchiveCommand_initTelemetry() {
+_SpoSiteUnarchiveCommand_instances = new WeakSet(), _SpoSiteUnarchiveCommand_initTelemetry = function _SpoSiteUnarchiveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             force: !!args.options.force
         });
     });
-}, _SpoTenantSiteUnarchiveCommand_initOptions = function _SpoTenantSiteUnarchiveCommand_initOptions() {
+}, _SpoSiteUnarchiveCommand_initOptions = function _SpoSiteUnarchiveCommand_initOptions() {
     this.options.unshift({
         option: '-u, --url <url>'
     }, {
         option: '-f, --force'
     });
-}, _SpoTenantSiteUnarchiveCommand_initValidators = function _SpoTenantSiteUnarchiveCommand_initValidators() {
+}, _SpoSiteUnarchiveCommand_initValidators = function _SpoSiteUnarchiveCommand_initValidators() {
     this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.url));
-}, _SpoTenantSiteUnarchiveCommand_initTypes = function _SpoTenantSiteUnarchiveCommand_initTypes() {
+}, _SpoSiteUnarchiveCommand_initTypes = function _SpoSiteUnarchiveCommand_initTypes() {
     this.types.string.push('url');
     this.types.boolean.push('force');
 };
-export default new SpoTenantSiteUnarchiveCommand();
-//# sourceMappingURL=tenant-site-unarchive.js.map
+export default new SpoSiteUnarchiveCommand();
+//# sourceMappingURL=site-unarchive.js.map

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

@@ -31,9 +31,6 @@ class SpoTermListCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoTermListCommand_instances, "m", _SpoTermListCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
-        if (args.options.includeChildTerms) {
-            await this.warn(logger, `Parameter 'includeChildTerms' is deprecated. Please use 'withChildTerms' instead`);
-        }
         try {
             const spoWebUrl = args.options.webUrl ? args.options.webUrl : await spo.getSpoAdminUrl(logger, this.debug);
             const res = await spo.getRequestDigest(spoWebUrl);
@@ -43,7 +40,7 @@ class SpoTermListCommand extends SpoCommand {
             const termGroupQuery = args.options.termGroupId ? `<Method Id="77" ParentId="75" Name="GetById"><Parameters><Parameter Type="Guid">{${args.options.termGroupId}}</Parameter></Parameters></Method>` : `<Method Id="77" ParentId="75" Name="GetByName"><Parameters><Parameter Type="String">${formatting.escapeXml(args.options.termGroupName)}</Parameter></Parameters></Method>`;
             const termSetQuery = args.options.termSetId ? `<Method Id="82" ParentId="80" Name="GetById"><Parameters><Parameter Type="Guid">{${args.options.termSetId}}</Parameter></Parameters></Method>` : `<Method Id="82" ParentId="80" Name="GetByName"><Parameters><Parameter Type="String">${formatting.escapeXml(args.options.termSetName)}</Parameter></Parameters></Method>`;
             const 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="70" ObjectPathId="69" /><ObjectIdentityQuery Id="71" ObjectPathId="69" /><ObjectPath Id="73" ObjectPathId="72" /><ObjectIdentityQuery Id="74" ObjectPathId="72" /><ObjectPath Id="76" ObjectPathId="75" /><ObjectPath Id="78" ObjectPathId="77" /><ObjectIdentityQuery Id="79" ObjectPathId="77" /><ObjectPath Id="81" ObjectPathId="80" /><ObjectPath Id="83" ObjectPathId="82" /><ObjectIdentityQuery Id="84" ObjectPathId="82" /><ObjectPath Id="86" ObjectPathId="85" /><Query Id="87" ObjectPathId="85"><Query SelectAllProperties="false"><Properties /></Query><ChildItemQuery SelectAllProperties="true"><Properties><Property Name="Name" ScalarProperty="true" /><Property Name="Id" ScalarProperty="true" /></Properties></ChildItemQuery></Query></Actions><ObjectPaths><StaticMethod Id="69" Name="GetTaxonomySession" TypeId="{981cbc68-9edc-4f8d-872f-71146fcbb84f}" /><Method Id="72" ParentId="69" Name="GetDefaultSiteCollectionTermStore" /><Property Id="75" ParentId="72" Name="Groups" />${termGroupQuery}<Property Id="80" ParentId="77" Name="TermSets" />${termSetQuery}<Property Id="85" ParentId="82" Name="Terms" /></ObjectPaths></Request>`;
-            const shouldIncludeChildTerms = args.options.includeChildTerms || args.options.withChildTerms;
+            const shouldIncludeChildTerms = args.options.withChildTerms;
             const result = await this.executeCsomCall(data, spoWebUrl, res);
             const terms = [];
             if (result._Child_Items_ && result._Child_Items_.length > 0) {
@@ -146,7 +143,6 @@ _SpoTermListCommand_instances = new WeakSet(), _SpoTermListCommand_initTelemetry
             termGroupName: typeof args.options.termGroupName !== 'undefined',
             termSetId: typeof args.options.termSetId !== 'undefined',
             termSetName: typeof args.options.termSetName !== 'undefined',
-            includeChildTerms: !!args.options.includeChildTerms,
             withChildTerms: !!args.options.withChildTerms
         });
     });
@@ -161,8 +157,6 @@ _SpoTermListCommand_instances = new WeakSet(), _SpoTermListCommand_initTelemetry
         option: '--termSetId [termSetId]'
     }, {
         option: '--termSetName [termSetName]'
-    }, {
-        option: '--includeChildTerms'
     }, {
         option: '--withChildTerms'
     });

package/dist/m365/spo/commands.js

@@ -83,6 +83,7 @@ export default {
     FILE_SHARINGLINK_SET: `${prefix} file sharinglink set`,
     FILE_VERSION_CLEAR: `${prefix} file version clear`,
     FILE_VERSION_GET: `${prefix} file version get`,
+    FILE_VERSION_KEEP: `${prefix} file version keep`,
     FILE_VERSION_LIST: `${prefix} file version list`,
     FILE_VERSION_REMOVE: `${prefix} file version remove`,
     FILE_VERSION_RESTORE: `${prefix} file version restore`,
@@ -264,6 +265,7 @@ export default {
     SITE_APPPERMISSION_LIST: `${prefix} site apppermission list`,
     SITE_APPPERMISSION_REMOVE: `${prefix} site apppermission remove`,
     SITE_APPPERMISSION_SET: `${prefix} site apppermission set`,
+    SITE_ARCHIVE: `${prefix} site archive`,
     SITE_COMMSITE_ENABLE: `${prefix} site commsite enable`,
     SITE_ENSURE: `${prefix} site ensure`,
     SITE_GET: `${prefix} site get`,
@@ -272,6 +274,7 @@ export default {
     SITE_HUBSITE_DISCONNECT: `${prefix} site hubsite disconnect`,
     SITE_HUBSITE_THEME_SYNC: `${prefix} site hubsite theme sync`,
     SITE_LIST: `${prefix} site list`,
+    SITE_MEMBERSHIP_LIST: `${prefix} site membership list`,
     SITE_INPLACERECORDSMANAGEMENT_SET: `${prefix} site inplacerecordsmanagement set`,
     SITE_RECYCLEBINITEM_CLEAR: `${prefix} site recyclebinitem clear`,
     SITE_RECYCLEBINITEM_LIST: `${prefix} site recyclebinitem list`,
@@ -279,9 +282,11 @@ export default {
     SITE_RECYCLEBINITEM_REMOVE: `${prefix} site recyclebinitem remove`,
     SITE_RECYCLEBINITEM_RESTORE: `${prefix} site recyclebinitem restore`,
     SITE_REMOVE: `${prefix} site remove`,
+    SITE_RENAME: `${prefix} site rename`,
     SITE_SET: `${prefix} site set`,
     SITE_SHARINGPERMISSION_SET: `${prefix} site sharingpermission set`,
     SITE_CHROME_SET: `${prefix} site chrome set`,
+    SITE_UNARCHIVE: `${prefix} site unarchive`,
     SITEDESIGN_ADD: `${prefix} sitedesign add`,
     SITEDESIGN_APPLY: `${prefix} sitedesign apply`,
     SITEDESIGN_GET: `${prefix} sitedesign get`,
@@ -324,17 +329,11 @@ export default {
     TENANT_COMMANDSET_LIST: `${prefix} tenant commandset list`,
     TENANT_COMMANDSET_REMOVE: `${prefix} tenant commandset remove`,
     TENANT_COMMANDSET_SET: `${prefix} tenant commandset set`,
-    TENANT_HOMESITE_LIST: `${prefix} tenant homesite list`,
     TENANT_RECYCLEBINITEM_LIST: `${prefix} tenant recyclebinitem list`,
     TENANT_RECYCLEBINITEM_REMOVE: `${prefix} tenant recyclebinitem remove`,
     TENANT_RECYCLEBINITEM_RESTORE: `${prefix} tenant recyclebinitem restore`,
     TENANT_SETTINGS_LIST: `${prefix} tenant settings list`,
     TENANT_SETTINGS_SET: `${prefix} tenant settings set`,
-    TENANT_SITE_ARCHIVE: `${prefix} tenant site archive`,
-    TENANT_SITE_LIST: `${prefix} tenant site list`,
-    TENANT_SITE_RENAME: `${prefix} tenant site rename`,
-    TENANT_SITE_MEMBERSHIP_LIST: `${prefix} tenant site membership list`,
-    TENANT_SITE_UNARCHIVE: `${prefix} tenant site unarchive`,
     TERM_ADD: `${prefix} term add`,
     TERM_GET: `${prefix} term get`,
     TERM_LIST: `${prefix} term list`,