@pnp/cli-microsoft365 9.1.0-beta.acd25f7 → 10.0.0-beta.04ac437

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

@@ -5,6 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoFileCopyCommand_instances, _SpoFileCopyCommand_initTelemetry, _SpoFileCopyCommand_initOptions, _SpoFileCopyCommand_initValidators, _SpoFileCopyCommand_initOptionSets, _SpoFileCopyCommand_initTypes;
 import request from '../../../../request.js';
+import { CreateCopyJobsNameConflictBehavior, spo } from '../../../../utils/spo.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -26,43 +27,51 @@ class SpoFileCopyCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoFileCopyCommand_instances, "m", _SpoFileCopyCommand_initOptionSets).call(this);
         __classPrivateFieldGet(this, _SpoFileCopyCommand_instances, "m", _SpoFileCopyCommand_initTypes).call(this);
     }
+    getExcludedOptionsWithUrls() {
+        return ['targetUrl', 'sourceUrl'];
+    }
     async commandAction(logger, args) {
         try {
             const sourceServerRelativePath = await this.getSourcePath(logger, args.options);
             const sourcePath = this.getAbsoluteUrl(args.options.webUrl, sourceServerRelativePath);
-            let destinationPath = this.getAbsoluteUrl(args.options.webUrl, args.options.targetUrl) + '/';
-            if (args.options.newName) {
-                destinationPath += args.options.newName;
+            const destinationPath = this.getAbsoluteUrl(args.options.webUrl, args.options.targetUrl);
+            if (this.verbose) {
+                await logger.logToStderr(`Copying file '${sourceServerRelativePath}' to '${args.options.targetUrl}'...`);
+            }
+            let newName = args.options.newName;
+            // Add original file extension if not provided
+            if (newName && !newName.includes('.')) {
+                newName += sourceServerRelativePath.substring(sourceServerRelativePath.lastIndexOf('.'));
             }
-            else {
-                // Keep the original file name
-                destinationPath += sourcePath.substring(sourcePath.lastIndexOf('/') + 1);
+            const copyJobResponse = await spo.createCopyJob(args.options.webUrl, sourcePath, destinationPath, {
+                nameConflictBehavior: this.getNameConflictBehaviorValue(args.options.nameConflictBehavior),
+                bypassSharedLock: !!args.options.bypassSharedLock,
+                ignoreVersionHistory: !!args.options.ignoreVersionHistory,
+                newName: newName,
+                operation: 'copy'
+            });
+            if (args.options.skipWait) {
+                return;
+            }
+            if (this.verbose) {
+                await logger.logToStderr('Waiting for the copy job to complete...');
             }
+            const copyJobResult = await spo.getCopyJobResult(args.options.webUrl, copyJobResponse);
             if (this.verbose) {
-                await logger.logToStderr(`Copying file '${sourcePath}' to '${destinationPath}'...`);
+                await logger.logToStderr('Getting information about the destination file...');
             }
+            // Get destination file data
+            const siteRelativeDestinationFolder = '/' + copyJobResult.TargetObjectSiteRelativeUrl.substring(0, copyJobResult.TargetObjectSiteRelativeUrl.lastIndexOf('/'));
+            const absoluteWebUrl = destinationPath.substring(0, destinationPath.toLowerCase().lastIndexOf(siteRelativeDestinationFolder.toLowerCase()));
             const requestOptions = {
-                url: `${args.options.webUrl}/_api/SP.MoveCopyUtil.CopyFileByPath`,
+                url: `${absoluteWebUrl}/_api/Web/GetFileById('${copyJobResult.TargetObjectUniqueId}')`,
                 headers: {
                     accept: 'application/json;odata=nometadata'
                 },
-                responseType: 'json',
-                data: {
-                    srcPath: {
-                        DecodedUrl: sourcePath
-                    },
-                    destPath: {
-                        DecodedUrl: destinationPath
-                    },
-                    overwrite: args.options.nameConflictBehavior === 'replace',
-                    options: {
-                        KeepBoth: args.options.nameConflictBehavior === 'rename',
-                        ResetAuthorAndCreatedOnCopy: !!args.options.resetAuthorAndCreated,
-                        ShouldBypassSharedLocks: !!args.options.bypassSharedLock
-                    }
-                }
+                responseType: 'json'
             };
-            await request.post(requestOptions);
+            const destinationFile = await request.get(requestOptions);
+            await logger.log(destinationFile);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
@@ -76,17 +85,30 @@ class SpoFileCopyCommand extends SpoCommand {
             await logger.logToStderr(`Retrieving server-relative path for file with ID '${options.sourceId}'...`);
         }
         const requestOptions = {
-            url: `${options.webUrl}/_api/Web/GetFileById('${options.sourceId}')?$select=ServerRelativePath`,
+            url: `${options.webUrl}/_api/Web/GetFileById('${options.sourceId}')/ServerRelativePath`,
             headers: {
                 accept: 'application/json;odata=nometadata'
             },
             responseType: 'json'
         };
         const file = await request.get(requestOptions);
-        return file.ServerRelativePath.DecodedUrl;
+        return file.DecodedUrl;
+    }
+    getNameConflictBehaviorValue(nameConflictBehavior) {
+        switch (nameConflictBehavior?.toLowerCase()) {
+            case 'fail':
+                return CreateCopyJobsNameConflictBehavior.Fail;
+            case 'replace':
+                return CreateCopyJobsNameConflictBehavior.Replace;
+            case 'rename':
+                return CreateCopyJobsNameConflictBehavior.Rename;
+            default:
+                return CreateCopyJobsNameConflictBehavior.Fail;
+        }
     }
     getAbsoluteUrl(webUrl, url) {
-        return url.startsWith('https://') ? url : urlUtil.getAbsoluteUrl(webUrl, url);
+        const result = url.startsWith('https://') ? url : urlUtil.getAbsoluteUrl(webUrl, url);
+        return urlUtil.removeTrailingSlashes(result);
     }
 }
 _SpoFileCopyCommand_instances = new WeakSet(), _SpoFileCopyCommand_initTelemetry = function _SpoFileCopyCommand_initTelemetry() {
@@ -95,9 +117,10 @@ _SpoFileCopyCommand_instances = new WeakSet(), _SpoFileCopyCommand_initTelemetry
             sourceUrl: typeof args.options.sourceUrl !== 'undefined',
             sourceId: typeof args.options.sourceId !== 'undefined',
             newName: typeof args.options.newName !== 'undefined',
-            nameConflictBehavior: args.options.nameConflictBehavior || false,
-            resetAuthorAndCreated: !!args.options.resetAuthorAndCreated,
-            bypassSharedLock: !!args.options.bypassSharedLock
+            nameConflictBehavior: typeof args.options.nameConflictBehavior !== 'undefined',
+            ignoreVersionHistory: !!args.options.ignoreVersionHistory,
+            bypassSharedLock: !!args.options.bypassSharedLock,
+            skipWait: !!args.options.skipWait
         });
     });
 }, _SpoFileCopyCommand_initOptions = function _SpoFileCopyCommand_initOptions() {
@@ -114,10 +137,12 @@ _SpoFileCopyCommand_instances = new WeakSet(), _SpoFileCopyCommand_initTelemetry
     }, {
         option: '--nameConflictBehavior [nameConflictBehavior]',
         autocomplete: this.nameConflictBehaviorOptions
-    }, {
-        option: '--resetAuthorAndCreated'
     }, {
         option: '--bypassSharedLock'
+    }, {
+        option: '--ignoreVersionHistory'
+    }, {
+        option: '--skipWait'
     });
 }, _SpoFileCopyCommand_initValidators = function _SpoFileCopyCommand_initValidators() {
     this.validators.push(async (args) => {
@@ -128,7 +153,7 @@ _SpoFileCopyCommand_instances = new WeakSet(), _SpoFileCopyCommand_initTelemetry
         if (args.options.sourceId && !validation.isValidGuid(args.options.sourceId)) {
             return `${args.options.sourceId} is not a valid GUID for sourceId.`;
         }
-        if (args.options.nameConflictBehavior && this.nameConflictBehaviorOptions.indexOf(args.options.nameConflictBehavior) === -1) {
+        if (args.options.nameConflictBehavior && !this.nameConflictBehaviorOptions.includes(args.options.nameConflictBehavior.toLowerCase())) {
             return `${args.options.nameConflictBehavior} is not a valid nameConflictBehavior value. Allowed values: ${this.nameConflictBehaviorOptions.join(', ')}.`;
         }
         return true;
@@ -137,7 +162,7 @@ _SpoFileCopyCommand_instances = new WeakSet(), _SpoFileCopyCommand_initTelemetry
     this.optionSets.push({ options: ['sourceUrl', 'sourceId'] });
 }, _SpoFileCopyCommand_initTypes = function _SpoFileCopyCommand_initTypes() {
     this.types.string.push('webUrl', 'sourceUrl', 'sourceId', 'targetUrl', 'newName', 'nameConflictBehavior');
-    this.types.boolean.push('resetAuthorAndCreated', 'bypassSharedLock');
+    this.types.boolean.push('bypassSharedLock', 'ignoreVersionHistory', 'skipWait');
 };
 export default new SpoFileCopyCommand();
 //# sourceMappingURL=file-copy.js.map

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

@@ -5,6 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoFileMoveCommand_instances, _SpoFileMoveCommand_initTelemetry, _SpoFileMoveCommand_initOptions, _SpoFileMoveCommand_initValidators, _SpoFileMoveCommand_initOptionSets, _SpoFileMoveCommand_initTypes;
 import request from '../../../../request.js';
+import { CreateCopyJobsNameConflictBehavior, spo } from '../../../../utils/spo.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -31,41 +32,46 @@ class SpoFileMoveCommand extends SpoCommand {
     }
     async commandAction(logger, args) {
         try {
-            const sourcePath = await this.getSourcePath(logger, args.options);
+            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 (this.verbose) {
-                await logger.logToStderr(`Moving file ${sourcePath} to ${args.options.targetUrl}...`);
+                await logger.logToStderr(`Moving file '${sourceServerRelativePath}' to '${args.options.targetUrl}'...`);
             }
-            const absoluteSourcePath = this.getAbsoluteUrl(args.options.webUrl, sourcePath);
-            let absoluteTargetPath = this.getAbsoluteUrl(args.options.webUrl, args.options.targetUrl) + '/';
-            if (args.options.newName) {
-                absoluteTargetPath += args.options.newName;
+            let newName = args.options.newName;
+            // Add original file extension if not provided
+            if (newName && !newName.includes('.')) {
+                newName += sourceServerRelativePath.substring(sourceServerRelativePath.lastIndexOf('.'));
             }
-            else {
-                // Keep the original file name
-                absoluteTargetPath += sourcePath.substring(sourcePath.lastIndexOf('/') + 1);
+            const copyJobResponse = await spo.createCopyJob(args.options.webUrl, sourcePath, destinationPath, {
+                nameConflictBehavior: this.getNameConflictBehaviorValue(args.options.nameConflictBehavior),
+                bypassSharedLock: !!args.options.bypassSharedLock,
+                includeItemPermissions: !!args.options.includeItemPermissions,
+                newName: newName,
+                operation: 'move'
+            });
+            if (args.options.skipWait) {
+                return;
             }
+            if (this.verbose) {
+                await logger.logToStderr('Waiting for the move job to complete...');
+            }
+            const copyJobResult = await spo.getCopyJobResult(args.options.webUrl, copyJobResponse);
+            if (this.verbose) {
+                await logger.logToStderr('Getting information about the destination file...');
+            }
+            // Get destination file data
+            const siteRelativeDestinationFolder = '/' + copyJobResult.TargetObjectSiteRelativeUrl.substring(0, copyJobResult.TargetObjectSiteRelativeUrl.lastIndexOf('/'));
+            const absoluteWebUrl = destinationPath.substring(0, destinationPath.toLowerCase().lastIndexOf(siteRelativeDestinationFolder.toLowerCase()));
             const requestOptions = {
-                url: `${args.options.webUrl}/_api/SP.MoveCopyUtil.MoveFileByPath`,
+                url: `${absoluteWebUrl}/_api/Web/GetFileById('${copyJobResult.TargetObjectUniqueId}')`,
                 headers: {
                     accept: 'application/json;odata=nometadata'
                 },
-                responseType: 'json',
-                data: {
-                    srcPath: {
-                        DecodedUrl: absoluteSourcePath
-                    },
-                    destPath: {
-                        DecodedUrl: absoluteTargetPath
-                    },
-                    overwrite: args.options.nameConflictBehavior === 'replace',
-                    options: {
-                        KeepBoth: args.options.nameConflictBehavior === 'rename',
-                        ShouldBypassSharedLocks: !!args.options.bypassSharedLock,
-                        RetainEditorAndModifiedOnMove: !!args.options.retainEditorAndModified
-                    }
-                }
+                responseType: 'json'
             };
-            await request.post(requestOptions);
+            const destinationFile = await request.get(requestOptions);
+            await logger.log(destinationFile);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
@@ -79,17 +85,30 @@ class SpoFileMoveCommand extends SpoCommand {
             await logger.logToStderr(`Retrieving server-relative path for file with ID '${options.sourceId}'...`);
         }
         const requestOptions = {
-            url: `${options.webUrl}/_api/Web/GetFileById('${options.sourceId}')?$select=ServerRelativePath`,
+            url: `${options.webUrl}/_api/Web/GetFileById('${options.sourceId}')/ServerRelativePath`,
             headers: {
                 accept: 'application/json;odata=nometadata'
             },
             responseType: 'json'
         };
         const file = await request.get(requestOptions);
-        return file.ServerRelativePath.DecodedUrl;
+        return file.DecodedUrl;
+    }
+    getNameConflictBehaviorValue(nameConflictBehavior) {
+        switch (nameConflictBehavior?.toLowerCase()) {
+            case 'fail':
+                return CreateCopyJobsNameConflictBehavior.Fail;
+            case 'replace':
+                return CreateCopyJobsNameConflictBehavior.Replace;
+            case 'rename':
+                return CreateCopyJobsNameConflictBehavior.Rename;
+            default:
+                return CreateCopyJobsNameConflictBehavior.Fail;
+        }
     }
     getAbsoluteUrl(webUrl, url) {
-        return url.startsWith('https://') ? url : urlUtil.getAbsoluteUrl(webUrl, url);
+        const result = url.startsWith('https://') ? url : urlUtil.getAbsoluteUrl(webUrl, url);
+        return urlUtil.removeTrailingSlashes(result);
     }
 }
 _SpoFileMoveCommand_instances = new WeakSet(), _SpoFileMoveCommand_initTelemetry = function _SpoFileMoveCommand_initTelemetry() {
@@ -99,8 +118,9 @@ _SpoFileMoveCommand_instances = new WeakSet(), _SpoFileMoveCommand_initTelemetry
             sourceId: typeof args.options.sourceId !== 'undefined',
             newName: typeof args.options.newName !== 'undefined',
             nameConflictBehavior: typeof args.options.nameConflictBehavior !== 'undefined',
-            retainEditorAndModified: !!args.options.retainEditorAndModified,
-            bypassSharedLock: !!args.options.bypassSharedLock
+            includeItemPermissions: !!args.options.includeItemPermissions,
+            bypassSharedLock: !!args.options.bypassSharedLock,
+            skipWait: !!args.options.skipWait
         });
     });
 }, _SpoFileMoveCommand_initOptions = function _SpoFileMoveCommand_initOptions() {
@@ -118,9 +138,11 @@ _SpoFileMoveCommand_instances = new WeakSet(), _SpoFileMoveCommand_initTelemetry
         option: '--nameConflictBehavior [nameConflictBehavior]',
         autocomplete: this.nameConflictBehaviorOptions
     }, {
-        option: '--retainEditorAndModified'
+        option: '--includeItemPermissions'
     }, {
         option: '--bypassSharedLock'
+    }, {
+        option: '--skipWait'
     });
 }, _SpoFileMoveCommand_initValidators = function _SpoFileMoveCommand_initValidators() {
     this.validators.push(async (args) => {
@@ -140,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('retainEditorAndModified', 'bypassSharedLock');
+    this.types.boolean.push('includeItemPermissions', 'bypassSharedLock', 'skipWait');
 };
 export default new SpoFileMoveCommand();
 //# sourceMappingURL=file-move.js.map

package/dist/m365/spo/commands/folder/folder-set.js

@@ -18,9 +18,6 @@ class SpoFolderSetCommand extends SpoCommand {
     get description() {
         return 'Updates a folder';
     }
-    alias() {
-        return [commands.FOLDER_RENAME];
-    }
     constructor() {
         super();
         _SpoFolderSetCommand_instances.add(this);
@@ -34,7 +31,6 @@ class SpoFolderSetCommand extends SpoCommand {
     }
     async commandAction(logger, args) {
         try {
-            await this.showDeprecationWarning(logger, this.alias()[0], this.name);
             if (this.verbose) {
                 await logger.logToStderr(`Updating folder '${args.options.name}'...`);
             }

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

@@ -16,7 +16,7 @@ class SpoListListCommand extends SpoCommand {
         return 'Lists all available list in the specified site';
     }
     defaultProperties() {
-        return ['Title', 'Url', 'Id'];
+        return ['Title', 'Id'];
     }
     constructor() {
         super();
@@ -36,9 +36,6 @@ class SpoListListCommand extends SpoCommand {
                 queryParams.push(`$filter=${args.options.filter}`);
             }
             const listInstances = await odata.getAllItems(`${args.options.webUrl}/_api/web/lists?${queryParams.join('&')}`);
-            listInstances.forEach(l => {
-                l.Url = l.RootFolder.ServerRelativeUrl;
-            });
             await logger.log(listInstances);
         }
         catch (err) {

package/dist/m365/spo/commands/site/site-appcatalog-remove.js

@@ -3,7 +3,8 @@ 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 _SpoSiteAppCatalogRemoveCommand_instances, _SpoSiteAppCatalogRemoveCommand_initOptions, _SpoSiteAppCatalogRemoveCommand_initValidators;
+var _SpoSiteAppCatalogRemoveCommand_instances, _SpoSiteAppCatalogRemoveCommand_initTelemetry, _SpoSiteAppCatalogRemoveCommand_initOptions, _SpoSiteAppCatalogRemoveCommand_initValidators, _SpoSiteAppCatalogRemoveCommand_initTypes;
+import { cli } from '../../../../cli/cli.js';
 import config from '../../../../config.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -21,47 +22,70 @@ class SpoSiteAppCatalogRemoveCommand extends SpoCommand {
     constructor() {
         super();
         _SpoSiteAppCatalogRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoSiteAppCatalogRemoveCommand_instances, "m", _SpoSiteAppCatalogRemoveCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoSiteAppCatalogRemoveCommand_instances, "m", _SpoSiteAppCatalogRemoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoSiteAppCatalogRemoveCommand_instances, "m", _SpoSiteAppCatalogRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoSiteAppCatalogRemoveCommand_instances, "m", _SpoSiteAppCatalogRemoveCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
-        const url = args.options.siteUrl;
-        try {
-            const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
-            const requestDigest = await spo.getRequestDigest(spoAdminUrl);
+        const removeSiteAppcatalog = async () => {
+            const url = args.options.siteUrl;
             if (this.verbose) {
                 await logger.logToStderr(`Disabling site collection app catalog...`);
             }
-            const requestOptions = {
-                url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
-                headers: {
-                    'X-RequestDigest': requestDigest.FormDigestValue
-                },
-                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="50" ObjectPathId="49" /><ObjectPath Id="52" ObjectPathId="51" /><ObjectPath Id="54" ObjectPathId="53" /><ObjectPath Id="56" ObjectPathId="55" /><ObjectPath Id="58" ObjectPathId="57" /><Method Name="Remove" Id="59" ObjectPathId="57"><Parameters><Parameter Type="String">${formatting.escapeXml(url)}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="49" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="51" ParentId="49" Name="GetSiteByUrl"><Parameters><Parameter Type="String">${formatting.escapeXml(url)}</Parameter></Parameters></Method><Property Id="53" ParentId="51" Name="RootWeb" /><Property Id="55" ParentId="53" Name="TenantAppCatalog" /><Property Id="57" ParentId="55" Name="SiteCollectionAppCatalogsSites" /></ObjectPaths></Request>`
-            };
-            const res = await request.post(requestOptions);
-            const json = JSON.parse(res);
-            const response = json[0];
-            if (response.ErrorInfo) {
-                throw response.ErrorInfo.ErrorMessage;
-            }
-            else {
-                if (this.verbose) {
-                    await logger.logToStderr('Site collection app catalog disabled');
+            try {
+                const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
+                const requestDigest = await spo.getRequestDigest(spoAdminUrl);
+                const requestOptions = {
+                    url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                    headers: {
+                        'X-RequestDigest': requestDigest.FormDigestValue
+                    },
+                    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="50" ObjectPathId="49" /><ObjectPath Id="52" ObjectPathId="51" /><ObjectPath Id="54" ObjectPathId="53" /><ObjectPath Id="56" ObjectPathId="55" /><ObjectPath Id="58" ObjectPathId="57" /><Method Name="Remove" Id="59" ObjectPathId="57"><Parameters><Parameter Type="String">${formatting.escapeXml(url)}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="49" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="51" ParentId="49" Name="GetSiteByUrl"><Parameters><Parameter Type="String">${formatting.escapeXml(url)}</Parameter></Parameters></Method><Property Id="53" ParentId="51" Name="RootWeb" /><Property Id="55" ParentId="53" Name="TenantAppCatalog" /><Property Id="57" ParentId="55" Name="SiteCollectionAppCatalogsSites" /></ObjectPaths></Request>`
+                };
+                const res = await request.post(requestOptions);
+                const json = JSON.parse(res);
+                const response = json[0];
+                if (response.ErrorInfo) {
+                    throw response.ErrorInfo.ErrorMessage;
+                }
+                else {
+                    if (this.verbose) {
+                        await logger.logToStderr('Site collection app catalog disabled');
+                    }
                 }
             }
+            catch (err) {
+                this.handleRejectedPromise(err);
+            }
+        };
+        if (args.options.force) {
+            await removeSiteAppcatalog();
         }
-        catch (err) {
-            this.handleRejectedPromise(err);
+        else {
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the app catalog from ${args.options.siteUrl}?` });
+            if (result) {
+                await removeSiteAppcatalog();
+            }
         }
     }
 }
-_SpoSiteAppCatalogRemoveCommand_instances = new WeakSet(), _SpoSiteAppCatalogRemoveCommand_initOptions = function _SpoSiteAppCatalogRemoveCommand_initOptions() {
+_SpoSiteAppCatalogRemoveCommand_instances = new WeakSet(), _SpoSiteAppCatalogRemoveCommand_initTelemetry = function _SpoSiteAppCatalogRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            force: !!args.options.force
+        });
+    });
+}, _SpoSiteAppCatalogRemoveCommand_initOptions = function _SpoSiteAppCatalogRemoveCommand_initOptions() {
     this.options.unshift({
         option: '-u, --siteUrl <siteUrl>'
+    }, {
+        option: '-f, --force'
     });
 }, _SpoSiteAppCatalogRemoveCommand_initValidators = function _SpoSiteAppCatalogRemoveCommand_initValidators() {
     this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.siteUrl));
+}, _SpoSiteAppCatalogRemoveCommand_initTypes = function _SpoSiteAppCatalogRemoveCommand_initTypes() {
+    this.types.string.push('siteUrl');
 };
 export default new SpoSiteAppCatalogRemoveCommand();
 //# sourceMappingURL=site-appcatalog-remove.js.map

package/dist/m365/spo/commands/site/site-remove.js

@@ -31,9 +31,6 @@ class SpoSiteRemoveCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoSiteRemoveCommand_instances, "m", _SpoSiteRemoveCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
-        if (args.options.wait) {
-            await this.warn(logger, `Option 'wait' is deprecated and will be removed in the next major release.`);
-        }
         if (args.options.force) {
             await this.removeSite(logger, args.options);
         }
@@ -196,7 +193,6 @@ _SpoSiteRemoveCommand_instances = new WeakSet(), _SpoSiteRemoveCommand_initTelem
         Object.assign(this.telemetryProperties, {
             skipRecycleBin: !!args.options.skipRecycleBin,
             fromRecycleBin: !!args.options.fromRecycleBin,
-            wait: !!args.options.wait,
             force: !!args.options.force
         });
     });
@@ -207,8 +203,6 @@ _SpoSiteRemoveCommand_instances = new WeakSet(), _SpoSiteRemoveCommand_initTelem
         option: '--skipRecycleBin'
     }, {
         option: '--fromRecycleBin'
-    }, {
-        option: '--wait'
     }, {
         option: '-f, --force'
     });
@@ -230,7 +224,7 @@ _SpoSiteRemoveCommand_instances = new WeakSet(), _SpoSiteRemoveCommand_initTelem
     });
 }, _SpoSiteRemoveCommand_initTypes = function _SpoSiteRemoveCommand_initTypes() {
     this.types.string.push('url');
-    this.types.boolean.push('skipRecycleBin', 'fromRecycleBin', 'wait', 'force');
+    this.types.boolean.push('skipRecycleBin', 'fromRecycleBin', 'force');
 };
 export default new SpoSiteRemoveCommand();
 //# sourceMappingURL=site-remove.js.map

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

@@ -37,8 +37,9 @@ class SpoSiteScriptGetCommand extends SpoCommand {
                 responseType: 'json'
             };
             const response = await request.post(requestOptions);
-            if (args.options.content === true) {
-                await logger.log(JSON.parse(response.Content));
+            response.Content = JSON.parse(response.Content);
+            if (args.options.content) {
+                await logger.log(response.Content);
                 return;
             }
             await logger.log(response);

package/dist/m365/spo/commands/tenant/tenant-recyclebinitem-restore.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 _SpoTenantRecycleBinItemRestoreCommand_instances, _SpoTenantRecycleBinItemRestoreCommand_initTelemetry, _SpoTenantRecycleBinItemRestoreCommand_initOptions, _SpoTenantRecycleBinItemRestoreCommand_initValidators, _SpoTenantRecycleBinItemRestoreCommand_initTypes;
+var _SpoTenantRecycleBinItemRestoreCommand_instances, _SpoTenantRecycleBinItemRestoreCommand_initOptions, _SpoTenantRecycleBinItemRestoreCommand_initValidators, _SpoTenantRecycleBinItemRestoreCommand_initTypes;
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
@@ -22,15 +22,11 @@ class SpoTenantRecycleBinItemRestoreCommand extends SpoCommand {
     constructor() {
         super();
         _SpoTenantRecycleBinItemRestoreCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoTenantRecycleBinItemRestoreCommand_instances, "m", _SpoTenantRecycleBinItemRestoreCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoTenantRecycleBinItemRestoreCommand_instances, "m", _SpoTenantRecycleBinItemRestoreCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoTenantRecycleBinItemRestoreCommand_instances, "m", _SpoTenantRecycleBinItemRestoreCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _SpoTenantRecycleBinItemRestoreCommand_instances, "m", _SpoTenantRecycleBinItemRestoreCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
-        if (args.options.wait) {
-            await this.warn(logger, `Option 'wait' is deprecated and will be removed in the next major release.`);
-        }
         try {
             if (this.verbose) {
                 await logger.logToStderr(`Restoring site collection '${args.options.siteUrl}' from recycle bin.`);
@@ -62,13 +58,6 @@ class SpoTenantRecycleBinItemRestoreCommand extends SpoCommand {
                 };
                 await request.post(restoreOptions);
             }
-            // Here, we return a fixed response because this new API endpoint doesn't return a response while the previous API did.
-            // This has to be removed in the next major release.
-            await logger.log({
-                HasTimedout: false,
-                IsComplete: !!args.options.wait,
-                PollingInterval: 15000
-            });
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
@@ -79,23 +68,14 @@ class SpoTenantRecycleBinItemRestoreCommand extends SpoCommand {
         return sites[0].GroupId;
     }
 }
-_SpoTenantRecycleBinItemRestoreCommand_instances = new WeakSet(), _SpoTenantRecycleBinItemRestoreCommand_initTelemetry = function _SpoTenantRecycleBinItemRestoreCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            wait: !!args.options.wait
-        });
-    });
-}, _SpoTenantRecycleBinItemRestoreCommand_initOptions = function _SpoTenantRecycleBinItemRestoreCommand_initOptions() {
+_SpoTenantRecycleBinItemRestoreCommand_instances = new WeakSet(), _SpoTenantRecycleBinItemRestoreCommand_initOptions = function _SpoTenantRecycleBinItemRestoreCommand_initOptions() {
     this.options.unshift({
         option: '-u, --siteUrl <siteUrl>'
-    }, {
-        option: '--wait'
     });
 }, _SpoTenantRecycleBinItemRestoreCommand_initValidators = function _SpoTenantRecycleBinItemRestoreCommand_initValidators() {
     this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.siteUrl));
 }, _SpoTenantRecycleBinItemRestoreCommand_initTypes = function _SpoTenantRecycleBinItemRestoreCommand_initTypes() {
     this.types.string.push('siteUrl');
-    this.types.boolean.push('wait');
 };
 export default new SpoTenantRecycleBinItemRestoreCommand();
 //# sourceMappingURL=tenant-recyclebinitem-restore.js.map

package/dist/m365/spo/commands.js

@@ -92,7 +92,6 @@ export default {
     FOLDER_LIST: `${prefix} folder list`,
     FOLDER_MOVE: `${prefix} folder move`,
     FOLDER_REMOVE: `${prefix} folder remove`,
-    FOLDER_RENAME: `${prefix} folder rename`,
     FOLDER_SET: `${prefix} folder set`,
     FOLDER_RETENTIONLABEL_ENSURE: `${prefix} folder retentionlabel ensure`,
     FOLDER_RETENTIONLABEL_REMOVE: `${prefix} folder retentionlabel remove`,

package/dist/m365/viva/commands/engage/engage-group-list.js

@@ -7,7 +7,6 @@ var _VivaEngageGroupListCommand_instances, _VivaEngageGroupListCommand_initTelem
 import request from '../../../../request.js';
 import VivaEngageCommand from '../../../base/VivaEngageCommand.js';
 import commands from '../../commands.js';
-import yammerCommands from './yammerCommands.js';
 class VivaEngageGroupListCommand extends VivaEngageCommand {
     get name() {
         return commands.ENGAGE_GROUP_LIST;
@@ -15,9 +14,6 @@ class VivaEngageGroupListCommand extends VivaEngageCommand {
     get description() {
         return 'Returns the list of groups in a Viva Engage network or the groups for a specific user';
     }
-    alias() {
-        return [yammerCommands.GROUP_LIST];
-    }
     constructor() {
         super();
         _VivaEngageGroupListCommand_instances.add(this);
@@ -59,7 +55,6 @@ class VivaEngageGroupListCommand extends VivaEngageCommand {
         }
     }
     async commandAction(logger, args) {
-        await this.showDeprecationWarning(logger, this.alias()[0], this.name);
         this.items = []; // this will reset the items array in interactive mode
         try {
             await this.getAllItems(logger, args, 1);

package/dist/m365/viva/commands/engage/engage-group-user-add.js

@@ -7,7 +7,6 @@ var _VivaEngageGroupUserAddCommand_instances, _VivaEngageGroupUserAddCommand_ini
 import request from '../../../../request.js';
 import VivaEngageCommand from '../../../base/VivaEngageCommand.js';
 import commands from '../../commands.js';
-import yammerCommands from './yammerCommands.js';
 class VivaEngageGroupUserAddCommand extends VivaEngageCommand {
     get name() {
         return commands.ENGAGE_GROUP_USER_ADD;
@@ -15,9 +14,6 @@ class VivaEngageGroupUserAddCommand extends VivaEngageCommand {
     get description() {
         return 'Adds a user to a Viva Engage Group';
     }
-    alias() {
-        return [yammerCommands.GROUP_USER_ADD];
-    }
     constructor() {
         super();
         _VivaEngageGroupUserAddCommand_instances.add(this);
@@ -26,7 +22,6 @@ class VivaEngageGroupUserAddCommand extends VivaEngageCommand {
         __classPrivateFieldGet(this, _VivaEngageGroupUserAddCommand_instances, "m", _VivaEngageGroupUserAddCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
-        await this.showDeprecationWarning(logger, this.alias()[0], this.name);
         const requestOptions = {
             url: `${this.resource}/v1/group_memberships.json`,
             headers: {