@pnp/cli-microsoft365 7.0.0-beta.f1037e1 → 7.0.0

package/dist/m365/spo/commands/file/file-version-clear.js

@@ -54,7 +54,7 @@ class SpoFileVersionClearCommand extends SpoCommand {
         let requestUrl = `${args.options.webUrl}/_api/web/`;
         if (args.options.fileUrl) {
             const serverRelativePath = urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
-            requestUrl += `GetFileByServerRelativeUrl('${formatting.encodeQueryParameter(serverRelativePath)}')/versions/DeleteAll()`;
+            requestUrl += `GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(serverRelativePath)}')/versions/DeleteAll()`;
         }
         else {
             requestUrl += `GetFileById('${args.options.fileId}')/versions/DeleteAll()`;
@@ -79,9 +79,9 @@ _SpoFileVersionClearCommand_instances = new WeakSet(), _SpoFileVersionClearComma
     });
 }, _SpoFileVersionClearCommand_initOptions = function _SpoFileVersionClearCommand_initOptions() {
     this.options.unshift({
-        option: '-w, --webUrl <webUrl>'
+        option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-u, --fileUrl [fileUrl]'
+        option: '--fileUrl [fileUrl]'
     }, {
         option: '-i, --fileId [fileId]'
     }, {

package/dist/m365/spo/commands/file/file-version-get.js

@@ -42,7 +42,7 @@ class SpoFileVersionGetCommand extends SpoCommand {
         let requestUrl = `${args.options.webUrl}/_api/web/`;
         if (args.options.fileUrl) {
             const serverRelUrl = urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
-            requestUrl += `GetFileByServerRelativeUrl('${formatting.encodeQueryParameter(serverRelUrl)}')/versions/?$filter=VersionLabel eq '${args.options.label}'`;
+            requestUrl += `GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(serverRelUrl)}')/versions/?$filter=VersionLabel eq '${args.options.label}'`;
         }
         else {
             requestUrl += `GetFileById('${args.options.fileId}')/versions/?$filter=VersionLabel eq '${args.options.label}'`;
@@ -67,11 +67,11 @@ _SpoFileVersionGetCommand_instances = new WeakSet(), _SpoFileVersionGetCommand_i
     });
 }, _SpoFileVersionGetCommand_initOptions = function _SpoFileVersionGetCommand_initOptions() {
     this.options.unshift({
-        option: '-w, --webUrl <webUrl>'
+        option: '-u, --webUrl <webUrl>'
     }, {
         option: '--label <label>'
     }, {
-        option: '-u, --fileUrl [fileUrl]'
+        option: '--fileUrl [fileUrl]'
     }, {
         option: '-i, --fileId [fileId]'
     });

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

@@ -36,7 +36,7 @@ class SpoFileVersionListCommand extends SpoCommand {
             let requestUrl = `${args.options.webUrl}/_api/web`;
             if (args.options.fileUrl) {
                 const serverRelativeUrl = urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
-                requestUrl += `/GetFileByServerRelativeUrl('${formatting.encodeQueryParameter(serverRelativeUrl)}')`;
+                requestUrl += `/GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(serverRelativeUrl)}')`;
             }
             else {
                 requestUrl += `/GetFileById('${args.options.fileId}')`;
@@ -59,9 +59,9 @@ _SpoFileVersionListCommand_instances = new WeakSet(), _SpoFileVersionListCommand
     });
 }, _SpoFileVersionListCommand_initOptions = function _SpoFileVersionListCommand_initOptions() {
     this.options.unshift({
-        option: '-w, --webUrl <webUrl>'
+        option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-u, --fileUrl [fileUrl]'
+        option: '--fileUrl [fileUrl]'
     }, {
         option: '-i, --fileId [fileId]'
     });

package/dist/m365/spo/commands/file/file-version-remove.js

@@ -55,7 +55,7 @@ class SpoFileVersionRemoveCommand extends SpoCommand {
         let requestUrl = `${args.options.webUrl}/_api/web/`;
         if (args.options.fileUrl) {
             const serverRelativePath = urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
-            requestUrl += `GetFileByServerRelativeUrl('${formatting.encodeQueryParameter(serverRelativePath)}')/versions/DeleteByLabel('${args.options.label}')`;
+            requestUrl += `GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(serverRelativePath)}')/versions/DeleteByLabel('${args.options.label}')`;
         }
         else {
             requestUrl += `GetFileById('${args.options.fileId}')/versions/DeleteByLabel('${args.options.label}')`;
@@ -80,11 +80,11 @@ _SpoFileVersionRemoveCommand_instances = new WeakSet(), _SpoFileVersionRemoveCom
     });
 }, _SpoFileVersionRemoveCommand_initOptions = function _SpoFileVersionRemoveCommand_initOptions() {
     this.options.unshift({
-        option: '-w, --webUrl <webUrl>'
+        option: '-u, --webUrl <webUrl>'
     }, {
         option: '--label <label>'
     }, {
-        option: '-u, --fileUrl [fileUrl]'
+        option: '--fileUrl [fileUrl]'
     }, {
         option: '-i, --fileId [fileId]'
     }, {

package/dist/m365/spo/commands/file/file-version-restore.js

@@ -55,7 +55,7 @@ class SpoFileVersionRestoreCommand extends SpoCommand {
         let requestUrl = `${args.options.webUrl}/_api/web/`;
         if (args.options.fileUrl) {
             const serverRelativePath = urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
-            requestUrl += `GetFileByServerRelativeUrl('${formatting.encodeQueryParameter(serverRelativePath)}')/versions/RestoreByLabel('${args.options.label}')`;
+            requestUrl += `GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(serverRelativePath)}')/versions/RestoreByLabel('${args.options.label}')`;
         }
         else {
             requestUrl += `GetFileById('${args.options.fileId}')/versions/RestoreByLabel('${args.options.label}')`;
@@ -80,11 +80,11 @@ _SpoFileVersionRestoreCommand_instances = new WeakSet(), _SpoFileVersionRestoreC
     });
 }, _SpoFileVersionRestoreCommand_initOptions = function _SpoFileVersionRestoreCommand_initOptions() {
     this.options.unshift({
-        option: '-w, --webUrl <webUrl>'
+        option: '-u, --webUrl <webUrl>'
     }, {
         option: '--label <label>'
     }, {
-        option: '-u, --fileUrl [fileUrl]'
+        option: '--fileUrl [fileUrl]'
     }, {
         option: '-i, --fileId [fileId]'
     }, {

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

@@ -5,6 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoFolderAddCommand_instances, _SpoFolderAddCommand_initOptions, _SpoFolderAddCommand_initValidators;
 import request from '../../../../request.js';
+import { formatting } from '../../../../utils/formatting.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -28,15 +29,12 @@ class SpoFolderAddCommand extends SpoCommand {
         }
         const parentFolderServerRelativeUrl = urlUtil.getServerRelativePath(args.options.webUrl, args.options.parentFolderUrl);
         const serverRelativeUrl = `${parentFolderServerRelativeUrl}/${args.options.name}`;
-        const requestUrl = `${args.options.webUrl}/_api/web/folders`;
+        const requestUrl = `${args.options.webUrl}/_api/web/folders/addUsingPath(decodedUrl='${formatting.encodeQueryParameter(serverRelativeUrl)}')`;
         const requestOptions = {
             url: requestUrl,
             headers: {
                 'accept': 'application/json;odata=nometadata'
             },
-            data: {
-                'ServerRelativeUrl': serverRelativeUrl
-            },
             responseType: 'json'
         };
         try {

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

@@ -3,10 +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 _SpoFolderCopyCommand_instances, _SpoFolderCopyCommand_initTelemetry, _SpoFolderCopyCommand_initOptions, _SpoFolderCopyCommand_initValidators;
-import url from 'url';
+var _SpoFolderCopyCommand_instances, _SpoFolderCopyCommand_initTelemetry, _SpoFolderCopyCommand_initOptions, _SpoFolderCopyCommand_initValidators, _SpoFolderCopyCommand_initOptionSets;
 import request from '../../../../request.js';
-import { spo } from '../../../../utils/spo.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -21,77 +19,123 @@ class SpoFolderCopyCommand extends SpoCommand {
     constructor() {
         super();
         _SpoFolderCopyCommand_instances.add(this);
+        this.nameConflictBehaviorOptions = ['fail', 'rename'];
         __classPrivateFieldGet(this, _SpoFolderCopyCommand_instances, "m", _SpoFolderCopyCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoFolderCopyCommand_instances, "m", _SpoFolderCopyCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoFolderCopyCommand_instances, "m", _SpoFolderCopyCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoFolderCopyCommand_instances, "m", _SpoFolderCopyCommand_initOptionSets).call(this);
     }
     getExcludedOptionsWithUrls() {
         return ['targetUrl', 'sourceUrl'];
     }
     async commandAction(logger, args) {
-        const webUrl = args.options.webUrl;
-        const parsedUrl = url.parse(webUrl);
-        const tenantUrl = `${parsedUrl.protocol}//${parsedUrl.hostname}`;
-        const serverRelativePath = urlUtil.getServerRelativePath(webUrl, args.options.sourceUrl);
-        const sourceAbsoluteUrl = urlUtil.urlCombine(tenantUrl, serverRelativePath);
-        const allowSchemaMismatch = args.options.allowSchemaMismatch || false;
-        const requestOptions = {
-            url: urlUtil.urlCombine(webUrl, '/_api/site/CreateCopyJobs'),
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            data: {
-                exportObjectUris: [sourceAbsoluteUrl],
-                destinationUri: urlUtil.urlCombine(tenantUrl, args.options.targetUrl),
-                options: {
-                    "AllowSchemaMismatch": allowSchemaMismatch,
-                    "IgnoreVersionHistory": true
-                }
-            },
-            responseType: 'json'
-        };
         try {
-            const jobInfo = await request.post(requestOptions);
-            const copyJobInfo = jobInfo.value[0];
-            const progressPollInterval = 30 * 60; //used previously implemented interval. The API does not provide guidance on what value should be used.
-            await new Promise((resolve, reject) => {
-                setTimeout(() => {
-                    spo.waitUntilCopyJobFinished({
-                        copyJobInfo,
-                        siteUrl: webUrl,
-                        pollingInterval: progressPollInterval,
-                        resolve,
-                        reject,
-                        logger,
-                        debug: this.debug,
-                        verbose: this.verbose
-                    });
-                }, progressPollInterval);
-            });
+            const sourcePath = await this.getSourcePath(logger, args.options);
+            if (this.verbose) {
+                await logger.logToStderr(`Copying folder ${sourcePath} 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;
+            }
+            else {
+                // Keep the original folder name
+                absoluteTargetPath += sourcePath.substring(sourcePath.lastIndexOf('/') + 1);
+            }
+            const requestOptions = {
+                url: `${args.options.webUrl}/_api/SP.MoveCopyUtil.CopyFolderByPath`,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json',
+                data: {
+                    srcPath: {
+                        DecodedUrl: absoluteSourcePath
+                    },
+                    destPath: {
+                        DecodedUrl: absoluteTargetPath
+                    },
+                    options: {
+                        KeepBoth: args.options.nameConflictBehavior === 'rename',
+                        ShouldBypassSharedLocks: !!args.options.bypassSharedLock,
+                        ResetAuthorAndCreatedOnCopy: !!args.options.resetAuthorAndCreated
+                    }
+                }
+            };
+            await request.post(requestOptions);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
         }
     }
+    async getSourcePath(logger, options) {
+        if (options.sourceUrl) {
+            return urlUtil.getServerRelativePath(options.webUrl, options.sourceUrl);
+        }
+        if (this.verbose) {
+            await logger.logToStderr(`Retrieving server-relative path for folder with ID '${options.sourceId}'...`);
+        }
+        const requestOptions = {
+            url: `${options.webUrl}/_api/Web/GetFolderById('${options.sourceId}')?$select=ServerRelativePath`,
+            headers: {
+                accept: 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
+        };
+        const file = await request.get(requestOptions);
+        return file.ServerRelativePath.DecodedUrl;
+    }
+    getAbsoluteUrl(webUrl, url) {
+        return url.startsWith('https://') ? url : urlUtil.getAbsoluteUrl(webUrl, url);
+    }
 }
 _SpoFolderCopyCommand_instances = new WeakSet(), _SpoFolderCopyCommand_initTelemetry = function _SpoFolderCopyCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            allowSchemaMismatch: args.options.allowSchemaMismatch || false
+            sourceUrl: typeof args.options.sourceUrl !== 'undefined',
+            sourceId: typeof args.options.sourceId !== 'undefined',
+            newName: typeof args.options.newName !== 'undefined',
+            nameConflictBehavior: typeof args.options.nameConflictBehavior !== 'undefined',
+            resetAuthorAndCreated: !!args.options.resetAuthorAndCreated,
+            bypassSharedLock: !!args.options.bypassSharedLock
         });
     });
 }, _SpoFolderCopyCommand_initOptions = function _SpoFolderCopyCommand_initOptions() {
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-s, --sourceUrl <sourceUrl>'
+        option: '-s, --sourceUrl [sourceUrl]'
+    }, {
+        option: '-i, --sourceId [sourceId]'
     }, {
         option: '-t, --targetUrl <targetUrl>'
     }, {
-        option: '--allowSchemaMismatch'
+        option: '--newName [newName]'
+    }, {
+        option: '--nameConflictBehavior [nameConflictBehavior]',
+        autocomplete: this.nameConflictBehaviorOptions
+    }, {
+        option: '--resetAuthorAndCreated'
+    }, {
+        option: '--bypassSharedLock'
     });
 }, _SpoFolderCopyCommand_initValidators = function _SpoFolderCopyCommand_initValidators() {
-    this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.webUrl));
+    this.validators.push(async (args) => {
+        const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
+        if (isValidSharePointUrl !== true) {
+            return isValidSharePointUrl;
+        }
+        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) {
+            return `'${args.options.nameConflictBehavior}' is not a valid value for nameConflictBehavior. Allowed values are: ${this.nameConflictBehaviorOptions.join(', ')}.`;
+        }
+        return true;
+    });
+}, _SpoFolderCopyCommand_initOptionSets = function _SpoFolderCopyCommand_initOptionSets() {
+    this.optionSets.push({ options: ['sourceUrl', 'sourceId'] });
 };
 export default new SpoFolderCopyCommand();
 //# sourceMappingURL=folder-copy.js.map

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

@@ -40,7 +40,7 @@ class SpoFolderGetCommand extends SpoCommand {
         }
         else if (args.options.url) {
             const serverRelativePath = urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
-            requestUrl += `/GetFolderByServerRelativeUrl('${formatting.encodeQueryParameter(serverRelativePath)}')`;
+            requestUrl += `/GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(serverRelativePath)}')`;
         }
         if (args.options.withPermissions) {
             requestUrl += `?$expand=ListItemAllFields/HasUniqueRoleAssignments,ListItemAllFields/RoleAssignments/Member,ListItemAllFields/RoleAssignments/RoleDefinitionBindings`;

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

@@ -52,7 +52,7 @@ class SpoFolderListCommand extends SpoCommand {
         }
         const allFolders = [];
         const serverRelativeUrl = urlUtil.getServerRelativePath(args.options.webUrl, parentFolderUrl);
-        const requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl(@url)/Folders?@url='${formatting.encodeQueryParameter(serverRelativeUrl)}'`;
+        const requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(serverRelativeUrl)}')/Folders`;
         const queryParams = [`$skip=${skip}`, `$top=${SpoFolderListCommand.pageSize}`];
         if (fieldProperties.expandProperties.length > 0) {
             queryParams.push(`$expand=${fieldProperties.expandProperties.join(',')}`);
@@ -64,7 +64,7 @@ class SpoFolderListCommand extends SpoCommand {
             queryParams.push(`$filter=${args.options.filter}`);
         }
         const requestOptions = {
-            url: `${requestUrl}&${queryParams.join('&')}`,
+            url: `${requestUrl}?${queryParams.join('&')}`,
             method: 'GET',
             headers: {
                 'accept': 'application/json;odata=nometadata'

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

@@ -3,10 +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 _SpoFolderMoveCommand_instances, _SpoFolderMoveCommand_initTelemetry, _SpoFolderMoveCommand_initOptions, _SpoFolderMoveCommand_initValidators;
-import url from 'url';
+var _SpoFolderMoveCommand_instances, _SpoFolderMoveCommand_initTelemetry, _SpoFolderMoveCommand_initOptions, _SpoFolderMoveCommand_initValidators, _SpoFolderMoveCommand_initOptionSets;
 import request from '../../../../request.js';
-import { spo } from '../../../../utils/spo.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -21,79 +19,123 @@ class SpoFolderMoveCommand extends SpoCommand {
     constructor() {
         super();
         _SpoFolderMoveCommand_instances.add(this);
+        this.nameConflictBehaviorOptions = ['fail', 'rename'];
         __classPrivateFieldGet(this, _SpoFolderMoveCommand_instances, "m", _SpoFolderMoveCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoFolderMoveCommand_instances, "m", _SpoFolderMoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoFolderMoveCommand_instances, "m", _SpoFolderMoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoFolderMoveCommand_instances, "m", _SpoFolderMoveCommand_initOptionSets).call(this);
     }
     getExcludedOptionsWithUrls() {
         return ['targetUrl', 'sourceUrl'];
     }
     async commandAction(logger, args) {
-        const webUrl = args.options.webUrl;
-        const parsedUrl = url.parse(webUrl);
-        const tenantUrl = `${parsedUrl.protocol}//${parsedUrl.hostname}`;
-        const sourceRelUrl = urlUtil.getServerRelativePath(webUrl, args.options.sourceUrl);
-        const sourceAbsoluteUrl = urlUtil.urlCombine(tenantUrl, sourceRelUrl);
-        const allowSchemaMismatch = args.options.allowSchemaMismatch || false;
-        const requestUrl = urlUtil.urlCombine(webUrl, '/_api/site/CreateCopyJobs');
-        const requestOptions = {
-            url: requestUrl,
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            data: {
-                exportObjectUris: [sourceAbsoluteUrl],
-                destinationUri: urlUtil.urlCombine(tenantUrl, args.options.targetUrl),
-                options: {
-                    "AllowSchemaMismatch": allowSchemaMismatch,
-                    "IgnoreVersionHistory": true,
-                    "IsMoveMode": true
-                }
-            },
-            responseType: 'json'
-        };
         try {
-            const jobInfo = await request.post(requestOptions);
-            const copyJobInfo = jobInfo.value[0];
-            const progressPollInterval = 30 * 60; //used previously implemented interval. The API does not provide guidance on what value should be used.
-            await new Promise((resolve, reject) => {
-                setTimeout(() => {
-                    spo.waitUntilCopyJobFinished({
-                        copyJobInfo,
-                        siteUrl: webUrl,
-                        pollingInterval: progressPollInterval,
-                        resolve,
-                        reject,
-                        logger,
-                        debug: this.debug,
-                        verbose: this.verbose
-                    });
-                }, progressPollInterval);
-            });
+            const sourcePath = await this.getSourcePath(logger, args.options);
+            if (this.verbose) {
+                await logger.logToStderr(`Moving folder '${sourcePath}' 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;
+            }
+            else {
+                // Keep the original file name
+                absoluteTargetPath += sourcePath.substring(sourcePath.lastIndexOf('/') + 1);
+            }
+            const requestOptions = {
+                url: `${args.options.webUrl}/_api/SP.MoveCopyUtil.MoveFolderByPath`,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json',
+                data: {
+                    srcPath: {
+                        DecodedUrl: absoluteSourcePath
+                    },
+                    destPath: {
+                        DecodedUrl: absoluteTargetPath
+                    },
+                    options: {
+                        KeepBoth: args.options.nameConflictBehavior === 'rename',
+                        ShouldBypassSharedLocks: !!args.options.bypassSharedLock,
+                        RetainEditorAndModifiedOnMove: !!args.options.retainEditorAndModified
+                    }
+                }
+            };
+            await request.post(requestOptions);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
         }
     }
+    async getSourcePath(logger, options) {
+        if (options.sourceUrl) {
+            return urlUtil.getServerRelativePath(options.webUrl, options.sourceUrl);
+        }
+        if (this.verbose) {
+            await logger.logToStderr(`Retrieving server-relative path for folder with ID '${options.sourceId}'...`);
+        }
+        const requestOptions = {
+            url: `${options.webUrl}/_api/Web/GetFolderById('${options.sourceId}')?$select=ServerRelativePath`,
+            headers: {
+                accept: 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
+        };
+        const file = await request.get(requestOptions);
+        return file.ServerRelativePath.DecodedUrl;
+    }
+    getAbsoluteUrl(webUrl, url) {
+        return url.startsWith('https://') ? url : urlUtil.getAbsoluteUrl(webUrl, url);
+    }
 }
 _SpoFolderMoveCommand_instances = new WeakSet(), _SpoFolderMoveCommand_initTelemetry = function _SpoFolderMoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            allowSchemaMismatch: args.options.allowSchemaMismatch || false
+            sourceUrl: typeof args.options.sourceUrl !== 'undefined',
+            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
         });
     });
 }, _SpoFolderMoveCommand_initOptions = function _SpoFolderMoveCommand_initOptions() {
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-s, --sourceUrl <sourceUrl>'
+        option: '-s, --sourceUrl [sourceUrl]'
+    }, {
+        option: '-i, --sourceId [sourceId]'
     }, {
         option: '-t, --targetUrl <targetUrl>'
     }, {
-        option: '--allowSchemaMismatch'
+        option: '--newName [newName]'
+    }, {
+        option: '--nameConflictBehavior [nameConflictBehavior]',
+        autocomplete: this.nameConflictBehaviorOptions
+    }, {
+        option: '--retainEditorAndModified'
+    }, {
+        option: '--bypassSharedLock'
     });
 }, _SpoFolderMoveCommand_initValidators = function _SpoFolderMoveCommand_initValidators() {
-    this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.webUrl));
+    this.validators.push(async (args) => {
+        const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
+        if (isValidSharePointUrl !== true) {
+            return isValidSharePointUrl;
+        }
+        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) {
+            return `'${args.options.nameConflictBehavior}' is not a valid value for nameConflictBehavior. Allowed values are: ${this.nameConflictBehaviorOptions.join(', ')}.`;
+        }
+        return true;
+    });
+}, _SpoFolderMoveCommand_initOptionSets = function _SpoFolderMoveCommand_initOptionSets() {
+    this.optionSets.push({ options: ['sourceUrl', 'sourceId'] });
 };
 export default new SpoFolderMoveCommand();
 //# sourceMappingURL=folder-move.js.map

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

@@ -25,6 +25,9 @@ class SpoFolderRemoveCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoFolderRemoveCommand_instances, "m", _SpoFolderRemoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoFolderRemoveCommand_instances, "m", _SpoFolderRemoveCommand_initValidators).call(this);
     }
+    getExcludedOptionsWithUrls() {
+        return ['url'];
+    }
     async commandAction(logger, args) {
         if (args.options.force) {
             await this.removeFolder(logger, args.options);
@@ -45,8 +48,8 @@ class SpoFolderRemoveCommand extends SpoCommand {
         if (this.verbose) {
             await logger.logToStderr(`Removing folder in site at ${options.webUrl}...`);
         }
-        const serverRelativeUrl = urlUtil.getServerRelativePath(options.webUrl, options.url);
-        let requestUrl = `${options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting.encodeQueryParameter(serverRelativeUrl)}')`;
+        const serverRelativePath = urlUtil.getServerRelativePath(options.webUrl, options.url);
+        let requestUrl = `${options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(serverRelativePath)}')`;
         if (options.recycle) {
             requestUrl += `/recycle()`;
         }
@@ -71,8 +74,8 @@ class SpoFolderRemoveCommand extends SpoCommand {
 _SpoFolderRemoveCommand_instances = new WeakSet(), _SpoFolderRemoveCommand_initTelemetry = function _SpoFolderRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            recycle: (!(!args.options.recycle)).toString(),
-            force: (!(!args.options.force)).toString()
+            recycle: !!args.options.recycle,
+            force: !!args.options.force
         });
     });
 }, _SpoFolderRemoveCommand_initOptions = function _SpoFolderRemoveCommand_initOptions() {

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

@@ -4,9 +4,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoFolderRenameCommand_instances, _SpoFolderRenameCommand_initOptions, _SpoFolderRenameCommand_initValidators;
-import config from '../../../../config.js';
 import request from '../../../../request.js';
-import { spo } from '../../../../utils/spo.js';
+import { formatting } from '../../../../utils/formatting.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -29,32 +28,29 @@ class SpoFolderRenameCommand extends SpoCommand {
     }
     async commandAction(logger, args) {
         try {
-            const contextResponse = await spo.getRequestDigest(args.options.webUrl);
-            const formDigestValue = contextResponse.FormDigestValue;
-            const webIdentityResp = await spo.getCurrentWebIdentity(args.options.webUrl, formDigestValue);
-            const folderObjectIdentity = await spo.getFolderIdentity(webIdentityResp.objectIdentity, args.options.webUrl, args.options.url, formDigestValue);
             if (this.verbose) {
                 await logger.logToStderr(`Renaming folder ${args.options.url} to ${args.options.name}`);
             }
             const serverRelativePath = urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
-            const serverRelativeUrlWithoutOldFolder = serverRelativePath.substring(0, serverRelativePath.lastIndexOf('/'));
-            const renamedServerRelativeUrl = `${serverRelativeUrlWithoutOldFolder}/${args.options.name}`;
             const requestOptions = {
-                url: `${args.options.webUrl}/_vti_bin/client.svc/ProcessQuery`,
+                url: `${args.options.webUrl}/_api/Web/GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(serverRelativePath)}')/ListItemAllFields`,
                 headers: {
-                    'X-RequestDigest': formDigestValue
+                    accept: 'application/json;odata=nometadata',
+                    'if-match': '*'
                 },
-                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><Method Name="MoveTo" Id="32" ObjectPathId="26"><Parameters><Parameter Type="String">${renamedServerRelativeUrl}</Parameter></Parameters></Method></Actions><ObjectPaths><Identity Id="26" Name="${folderObjectIdentity.objectIdentity}" /></ObjectPaths></Request>`
+                data: {
+                    FileLeafRef: args.options.name,
+                    Title: args.options.name
+                },
+                responseType: 'json'
             };
-            const res = await request.post(requestOptions);
-            const json = JSON.parse(res);
-            const contents = json.find(x => { return x['ErrorInfo']; });
-            if (contents && contents.ErrorInfo) {
-                throw contents.ErrorInfo.ErrorMessage || 'ClientSvc unknown error';
+            const response = await request.patch(requestOptions);
+            if (response && response['odata.null'] === true) {
+                throw 'Folder not found.';
             }
         }
         catch (err) {
-            this.handleRejectedPromise(err);
+            this.handleRejectedODataJsonPromise(err);
         }
     }
 }

package/dist/m365/spo/commands/folder/folder-retentionlabel-ensure.js

@@ -75,7 +75,7 @@ class SpoFolderRetentionLabelEnsureCommand extends SpoCommand {
         }
         else {
             const serverRelativeUrl = urlUtil.getServerRelativePath(args.options.webUrl, args.options.folderUrl);
-            requestUrl += `GetFolderByServerRelativeUrl('${formatting.encodeQueryParameter(serverRelativeUrl)}')`;
+            requestUrl += `GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(serverRelativeUrl)}')`;
         }
         const requestOptions = {
             url: `${requestUrl}?$expand=ListItemAllFields,ListItemAllFields/ParentList&$select=ServerRelativeUrl,ListItemAllFields/ParentList/Id,ListItemAllFields/Id`,

package/dist/m365/spo/commands/folder/folder-retentionlabel-remove.js

@@ -91,7 +91,7 @@ class SpoFolderRetentionLabelRemoveCommand extends SpoCommand {
         }
         else {
             const serverRelativeUrl = urlUtil.getServerRelativePath(args.options.webUrl, args.options.folderUrl);
-            requestUrl += `GetFolderByServerRelativeUrl('${formatting.encodeQueryParameter(serverRelativeUrl)}')`;
+            requestUrl += `GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(serverRelativeUrl)}')`;
         }
         const requestOptions = {
             url: `${requestUrl}?$expand=ListItemAllFields,ListItemAllFields/ParentList&$select=ServerRelativeUrl,ListItemAllFields/ParentList/Id,ListItemAllFields/Id`,