@pnp/cli-microsoft365 7.0.0-beta.4ebf3ad → 7.0.0-beta.515b009

package/dist/m365/spo/commands/commandset/commandset-set.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 _SpoCommandSetSetCommand_instances, _SpoCommandSetSetCommand_initTelemetry, _SpoCommandSetSetCommand_initOptions, _SpoCommandSetSetCommand_initValidators, _SpoCommandSetSetCommand_initOptionSets;
+var _SpoCommandSetSetCommand_instances, _a, _SpoCommandSetSetCommand_initTelemetry, _SpoCommandSetSetCommand_initOptions, _SpoCommandSetSetCommand_initValidators, _SpoCommandSetSetCommand_initOptionSets;
 import commands from '../../commands.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -109,7 +109,7 @@ class SpoCommandSetSetCommand extends SpoCommand {
         }
     }
 }
-_SpoCommandSetSetCommand_instances = new WeakSet(), _SpoCommandSetSetCommand_initTelemetry = function _SpoCommandSetSetCommand_initTelemetry() {
+_a = SpoCommandSetSetCommand, _SpoCommandSetSetCommand_instances = new WeakSet(), _SpoCommandSetSetCommand_initTelemetry = function _SpoCommandSetSetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             title: typeof args.options.title !== 'undefined',
@@ -136,13 +136,13 @@ _SpoCommandSetSetCommand_instances = new WeakSet(), _SpoCommandSetSetCommand_ini
     }, {
         option: '--newTitle [newTitle]'
     }, {
-        option: '-l, --listType [listType]', autocomplete: SpoCommandSetSetCommand.listTypes
+        option: '-l, --listType [listType]', autocomplete: _a.listTypes
     }, {
         option: '--clientSideComponentProperties  [clientSideComponentProperties]'
     }, {
-        option: '-s, --scope [scope]', autocomplete: SpoCommandSetSetCommand.scopes
+        option: '-s, --scope [scope]', autocomplete: _a.scopes
     }, {
-        option: '--location [location]', autocomplete: SpoCommandSetSetCommand.locations
+        option: '--location [location]', autocomplete: _a.locations
     });
 }, _SpoCommandSetSetCommand_initValidators = function _SpoCommandSetSetCommand_initValidators() {
     this.validators.push(async (args) => {
@@ -155,14 +155,14 @@ _SpoCommandSetSetCommand_instances = new WeakSet(), _SpoCommandSetSetCommand_ini
         if (args.options.newClientSideComponentId && !validation.isValidGuid(args.options.newClientSideComponentId)) {
             return `${args.options.newClientSideComponentId} is not a valid GUID`;
         }
-        if (args.options.listType && SpoCommandSetSetCommand.listTypes.indexOf(args.options.listType) < 0) {
-            return `${args.options.listType} is not a valid list type. Allowed values are ${SpoCommandSetSetCommand.listTypes.join(', ')}`;
+        if (args.options.listType && _a.listTypes.indexOf(args.options.listType) < 0) {
+            return `${args.options.listType} is not a valid list type. Allowed values are ${_a.listTypes.join(', ')}`;
         }
-        if (args.options.scope && SpoCommandSetSetCommand.scopes.indexOf(args.options.scope) < 0) {
-            return `${args.options.scope} is not a valid scope. Allowed values are ${SpoCommandSetSetCommand.scopes.join(', ')}`;
+        if (args.options.scope && _a.scopes.indexOf(args.options.scope) < 0) {
+            return `${args.options.scope} is not a valid scope. Allowed values are ${_a.scopes.join(', ')}`;
         }
-        if (args.options.location && SpoCommandSetSetCommand.locations.indexOf(args.options.location) < 0) {
-            return `${args.options.location} is not a valid location. Allowed values are ${SpoCommandSetSetCommand.locations.join(', ')}`;
+        if (args.options.location && _a.locations.indexOf(args.options.location) < 0) {
+            return `${args.options.location} is not a valid location. Allowed values are ${_a.locations.join(', ')}`;
         }
         if (!args.options.newTitle && !args.options.listType && !args.options.clientSideComponentProperties && !args.options.location && !args.options.newClientSideComponentId) {
             return `Please specify option to be updated`;

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

@@ -54,7 +54,7 @@ class SpoFileAddCommand extends SpoCommand {
         try {
             try {
                 const requestOptions = {
-                    url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting.encodeQueryParameter(folderPath)}')`,
+                    url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(folderPath)}')`,
                     headers: {
                         'accept': 'application/json;odata=nometadata'
                     }
@@ -88,7 +88,7 @@ class SpoFileAddCommand extends SpoCommand {
                 // initiate chunked upload session
                 const uploadId = v4();
                 const requestOptions = {
-                    url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting.encodeQueryParameter(folderPath)}')/Files/GetByPathOrAddStub(DecodedUrl='${formatting.encodeQueryParameter(fileName)}')/StartUpload(uploadId=guid'${uploadId}')`,
+                    url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(folderPath)}')/Files/GetByPathOrAddStub(DecodedUrl='${formatting.encodeQueryParameter(fileName)}')/StartUpload(uploadId=guid'${uploadId}')`,
                     headers: {
                         'accept': 'application/json;odata=nometadata'
                     }
@@ -116,7 +116,7 @@ class SpoFileAddCommand extends SpoCommand {
                         await logger.logToStderr('Cancelling upload session due to error...');
                     }
                     const requestOptions = {
-                        url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting.encodeQueryParameter(folderPath)}')/Files('${formatting.encodeQueryParameter(fileName)}')/cancelupload(uploadId=guid'${uploadId}')`,
+                        url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(folderPath)}')/Files('${formatting.encodeQueryParameter(fileName)}')/cancelupload(uploadId=guid'${uploadId}')`,
                         headers: {
                             'accept': 'application/json;odata=nometadata'
                         }
@@ -138,7 +138,7 @@ class SpoFileAddCommand extends SpoCommand {
                 const fileBody = fs.readFileSync(fullPath);
                 const bodyLength = fileBody.byteLength;
                 const requestOptions = {
-                    url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting.encodeQueryParameter(folderPath)}')/Files/Add(url='${formatting.encodeQueryParameter(fileName)}', overwrite=true)`,
+                    url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(folderPath)}')/Files/Add(url='${formatting.encodeQueryParameter(fileName)}', overwrite=true)`,
                     data: fileBody,
                     headers: {
                         'accept': 'application/json;odata=nometadata',
@@ -180,7 +180,7 @@ class SpoFileAddCommand extends SpoCommand {
                 }
                 // approve the existing file with given comment
                 const requestOptions = {
-                    url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting.encodeQueryParameter(folderPath)}')/Files('${formatting.encodeQueryParameter(fileName)}')/approve(comment='${formatting.encodeQueryParameter(args.options.approveComment || '')}')`,
+                    url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(folderPath)}')/Files('${formatting.encodeQueryParameter(fileName)}')/approve(comment='${formatting.encodeQueryParameter(args.options.approveComment || '')}')`,
                     headers: {
                         'accept': 'application/json;odata=nometadata'
                     },
@@ -197,7 +197,7 @@ class SpoFileAddCommand extends SpoCommand {
                 }
                 // publish the existing file with given comment
                 const requestOptions = {
-                    url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting.encodeQueryParameter(folderPath)}')/Files('${formatting.encodeQueryParameter(fileName)}')/publish(comment='${formatting.encodeQueryParameter(args.options.publishComment || '')}')`,
+                    url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(folderPath)}')/Files('${formatting.encodeQueryParameter(fileName)}')/publish(comment='${formatting.encodeQueryParameter(args.options.publishComment || '')}')`,
                     headers: {
                         'accept': 'application/json;odata=nometadata'
                     },
@@ -211,7 +211,7 @@ class SpoFileAddCommand extends SpoCommand {
                 // in a case the command has done checkout
                 // then have to rollback the checkout
                 const requestOptions = {
-                    url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting.encodeQueryParameter(folderPath)}')/Files('${formatting.encodeQueryParameter(fileName)}')/UndoCheckOut()`
+                    url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(folderPath)}')/Files('${formatting.encodeQueryParameter(fileName)}')/UndoCheckOut()`
                 };
                 try {
                     await request.post(requestOptions);
@@ -250,14 +250,14 @@ class SpoFileAddCommand extends SpoCommand {
     async fileCheckOut(fileName, webUrl, folder) {
         // check if file already exists, otherwise it can't be checked out
         const requestOptionsGetFile = {
-            url: `${webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting.encodeQueryParameter(folder)}')/Files('${formatting.encodeQueryParameter(fileName)}')`,
+            url: `${webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(folder)}')/Files('${formatting.encodeQueryParameter(fileName)}')`,
             headers: {
                 'accept': 'application/json;odata=nometadata'
             }
         };
         await request.get(requestOptionsGetFile);
         const requestOptionsCheckOut = {
-            url: `${webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting.encodeQueryParameter(folder)}')/Files('${formatting.encodeQueryParameter(fileName)}')/CheckOut()`,
+            url: `${webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(folder)}')/Files('${formatting.encodeQueryParameter(fileName)}')/CheckOut()`,
             headers: {
                 'accept': 'application/json;odata=nometadata'
             },
@@ -281,7 +281,7 @@ class SpoFileAddCommand extends SpoCommand {
                 fileBuffer = fileBuffer.slice(0, readCount);
             }
             const requestOptions = {
-                url: `${info.WebUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting.encodeQueryParameter(info.FolderPath)}')/Files('${formatting.encodeQueryParameter(info.Name)}')/${isLastChunk ? 'Finish' : 'Continue'}Upload(uploadId=guid'${info.Id}',fileOffset=${offset})`,
+                url: `${info.WebUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(info.FolderPath)}')/Files('${formatting.encodeQueryParameter(info.Name)}')/${isLastChunk ? 'Finish' : 'Continue'}Upload(uploadId=guid'${info.Id}',fileOffset=${offset})`,
                 data: fileBuffer,
                 headers: {
                     'accept': 'application/json;odata=nometadata',
@@ -338,7 +338,7 @@ class SpoFileAddCommand extends SpoCommand {
             await logger.logToStderr(`Getting list details in order to get its available content types afterwards...`);
         }
         const requestOptions = {
-            url: `${webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting.encodeQueryParameter(folder)}')/Files('${formatting.encodeQueryParameter(fileName)}')/ListItemAllFields/ParentList?$Select=Id,EnableModeration,EnableVersioning,EnableMinorVersions`,
+            url: `${webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(folder)}')/Files('${formatting.encodeQueryParameter(fileName)}')/ListItemAllFields/ParentList?$Select=Id,EnableModeration,EnableVersioning,EnableMinorVersions`,
             headers: {
                 'accept': 'application/json;odata=nometadata'
             },
@@ -361,7 +361,7 @@ class SpoFileAddCommand extends SpoCommand {
         }
         // update the existing file list item fields
         const requestOptions = {
-            url: `${webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting.encodeQueryParameter(folderPath)}')/Files('${formatting.encodeQueryParameter(fileName)}')/ListItemAllFields/ValidateUpdateListItem()`,
+            url: `${webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(folderPath)}')/Files('${formatting.encodeQueryParameter(fileName)}')/ListItemAllFields/ValidateUpdateListItem()`,
             headers: {
                 'accept': 'application/json;odata=nometadata'
             },
@@ -380,7 +380,7 @@ class SpoFileAddCommand extends SpoCommand {
     }
     async fileCheckIn(args, fileName) {
         const requestOptions = {
-            url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting.encodeQueryParameter(args.options.folder)}')/Files('${formatting.encodeQueryParameter(fileName)}')/CheckIn(comment='${formatting.encodeQueryParameter(args.options.checkInComment || '')}',checkintype=0)`,
+            url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(args.options.folder)}')/Files('${formatting.encodeQueryParameter(fileName)}')/CheckIn(comment='${formatting.encodeQueryParameter(args.options.checkInComment || '')}',checkintype=0)`,
             headers: {
                 'accept': 'application/json;odata=nometadata'
             },

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

@@ -55,7 +55,7 @@ class SpoFileCheckinCommand extends SpoCommand {
         }
         if (args.options.url) {
             const serverRelativePath = urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
-            requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting.encodeQueryParameter(serverRelativePath)}')/checkin(comment='${comment}',checkintype=${type})`;
+            requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(serverRelativePath)}')/checkin(comment='${comment}',checkintype=${type})`;
         }
         const requestOptions = {
             url: requestUrl,

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

@@ -35,7 +35,7 @@ class SpoFileCheckoutCommand extends SpoCommand {
         }
         if (args.options.url) {
             const serverRelativePath = urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
-            requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting.encodeQueryParameter(serverRelativePath)}')/checkout`;
+            requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(serverRelativePath)}')/checkout`;
         }
         const requestOptions = {
             url: requestUrl,

package/dist/m365/spo/commands/file/file-copy.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 _SpoFileCopyCommand_instances, _SpoFileCopyCommand_initTelemetry, _SpoFileCopyCommand_initOptions, _SpoFileCopyCommand_initValidators;
+var _SpoFileCopyCommand_instances, _SpoFileCopyCommand_initTelemetry, _SpoFileCopyCommand_initOptions, _SpoFileCopyCommand_initValidators, _SpoFileCopyCommand_initOptionSets;
 import request from '../../../../request.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
@@ -23,10 +23,12 @@ class SpoFileCopyCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoFileCopyCommand_instances, "m", _SpoFileCopyCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoFileCopyCommand_instances, "m", _SpoFileCopyCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoFileCopyCommand_instances, "m", _SpoFileCopyCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoFileCopyCommand_instances, "m", _SpoFileCopyCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
         try {
-            const sourcePath = this.getAbsoluteUrl(args.options.webUrl, urlUtil.getServerRelativePath(args.options.webUrl, args.options.sourceUrl));
+            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;
@@ -54,6 +56,7 @@ class SpoFileCopyCommand extends SpoCommand {
                     overwrite: args.options.nameConflictBehavior === 'replace',
                     options: {
                         KeepBoth: args.options.nameConflictBehavior === 'rename',
+                        ResetAuthorAndCreatedOnCopy: !!args.options.resetAuthorAndCreated,
                         ShouldBypassSharedLocks: !!args.options.bypassSharedLock
                     }
                 }
@@ -64,6 +67,23 @@ class SpoFileCopyCommand extends SpoCommand {
             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 file with ID '${options.sourceId}'...`);
+        }
+        const requestOptions = {
+            url: `${options.webUrl}/_api/Web/GetFileById('${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);
     }
@@ -71,8 +91,11 @@ class SpoFileCopyCommand extends SpoCommand {
 _SpoFileCopyCommand_instances = new WeakSet(), _SpoFileCopyCommand_initTelemetry = function _SpoFileCopyCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
+            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
         });
     });
@@ -80,7 +103,9 @@ _SpoFileCopyCommand_instances = new WeakSet(), _SpoFileCopyCommand_initTelemetry
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-s, --sourceUrl <sourceUrl>'
+        option: '-s, --sourceUrl [sourceUrl]'
+    }, {
+        option: '-i, --sourceId [sourceId]'
     }, {
         option: '-t, --targetUrl <targetUrl>'
     }, {
@@ -88,6 +113,8 @@ _SpoFileCopyCommand_instances = new WeakSet(), _SpoFileCopyCommand_initTelemetry
     }, {
         option: '--nameConflictBehavior [nameConflictBehavior]',
         autocomplete: this.nameConflictBehaviorOptions
+    }, {
+        option: '--resetAuthorAndCreated'
     }, {
         option: '--bypassSharedLock'
     });
@@ -97,11 +124,16 @@ _SpoFileCopyCommand_instances = new WeakSet(), _SpoFileCopyCommand_initTelemetry
         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 nameConflictBehavior value. Allowed values: ${this.nameConflictBehaviorOptions.join(', ')}`;
+            return `${args.options.nameConflictBehavior} is not a valid nameConflictBehavior value. Allowed values: ${this.nameConflictBehaviorOptions.join(', ')}.`;
         }
         return true;
     });
+}, _SpoFileCopyCommand_initOptionSets = function _SpoFileCopyCommand_initOptionSets() {
+    this.optionSets.push({ options: ['sourceUrl', 'sourceId'] });
 };
 export default new SpoFileCopyCommand();
 //# sourceMappingURL=file-copy.js.map

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

@@ -56,7 +56,7 @@ class SpoFileListCommand extends SpoCommand {
         }
         const allFiles = [];
         const serverRelativePath = urlUtil.getServerRelativePath(args.options.webUrl, folderUrl);
-        const requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl(@url)/Files?@url='${formatting.encodeQueryParameter(serverRelativePath)}'`;
+        const requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(serverRelativePath)}')/Files`;
         const queryParams = [`$skip=${skip}`, `$top=${SpoFileListCommand.pageSize}`];
         if (fieldProperties.expandProperties.length > 0) {
             queryParams.push(`$expand=${fieldProperties.expandProperties.join(',')}`);
@@ -68,7 +68,7 @@ class SpoFileListCommand 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'
@@ -90,9 +90,9 @@ class SpoFileListCommand extends SpoCommand {
         }
         const allFolders = [];
         const serverRelativeUrl = urlUtil.getServerRelativePath(args.options.webUrl, folderUrl);
-        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 requestOptions = {
-            url: `${requestUrl}&$skip=${skip}&$top=${SpoFileListCommand.pageSize}&$select=ServerRelativeUrl`,
+            url: `${requestUrl}?$skip=${skip}&$top=${SpoFileListCommand.pageSize}&$select=ServerRelativeUrl`,
             method: 'GET',
             headers: {
                 'accept': 'application/json;odata=nometadata'

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

@@ -3,17 +3,12 @@ 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 _SpoFileMoveCommand_instances, _SpoFileMoveCommand_initTelemetry, _SpoFileMoveCommand_initOptions, _SpoFileMoveCommand_initValidators;
-import url from 'url';
-import { Cli } from '../../../../cli/Cli.js';
+var _SpoFileMoveCommand_instances, _SpoFileMoveCommand_initTelemetry, _SpoFileMoveCommand_initOptions, _SpoFileMoveCommand_initValidators, _SpoFileMoveCommand_initOptionSets;
 import request from '../../../../request.js';
-import { formatting } from '../../../../utils/formatting.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';
 import commands from '../../commands.js';
-import removeCommand from './file-remove.js';
 class SpoFileMoveCommand extends SpoCommand {
     get name() {
         return commands.FILE_MOVE;
@@ -24,143 +19,124 @@ class SpoFileMoveCommand extends SpoCommand {
     constructor() {
         super();
         _SpoFileMoveCommand_instances.add(this);
+        this.nameConflictBehaviorOptions = ['fail', 'replace', 'rename'];
         __classPrivateFieldGet(this, _SpoFileMoveCommand_instances, "m", _SpoFileMoveCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoFileMoveCommand_instances, "m", _SpoFileMoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoFileMoveCommand_instances, "m", _SpoFileMoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoFileMoveCommand_instances, "m", _SpoFileMoveCommand_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}`;
         try {
-            const serverRelativePath = urlUtil.getServerRelativePath(webUrl, args.options.sourceUrl);
-            // Check if the source file exists.
-            // Called on purpose, we explicitly check if user specified file
-            // in the sourceUrl option.
-            // The CreateCopyJobs endpoint accepts file, folder or batch from both.
-            // A user might enter folder instead of file as source url by mistake
-            // then there are edge cases when deleteIfAlreadyExists flag is set
-            // the user can receive misleading error message.
-            await this.fileExists(webUrl, serverRelativePath);
-            if (args.options.deleteIfAlreadyExists) {
-                // try delete target file, if deleteIfAlreadyExists flag is set
-                const filename = args.options.sourceUrl.replace(/^.*[\\\/]/, '');
-                await this.recycleFile(tenantUrl, args.options.targetUrl, filename, logger);
+            const sourcePath = await this.getSourcePath(logger, args.options);
+            if (this.verbose) {
+                await logger.logToStderr(`Moving file ${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);
             }
-            // all preconditions met, now create copy job
-            const sourceAbsoluteUrl = urlUtil.urlCombine(tenantUrl, serverRelativePath);
-            const allowSchemaMismatch = args.options.allowSchemaMismatch || false;
-            const requestUrl = urlUtil.urlCombine(webUrl, '/_api/site/CreateCopyJobs');
             const requestOptions = {
-                url: requestUrl,
+                url: `${args.options.webUrl}/_api/SP.MoveCopyUtil.MoveFileByPath`,
                 headers: {
-                    'accept': 'application/json;odata=nometadata'
+                    accept: 'application/json;odata=nometadata'
                 },
+                responseType: 'json',
                 data: {
-                    exportObjectUris: [sourceAbsoluteUrl],
-                    destinationUri: urlUtil.urlCombine(tenantUrl, args.options.targetUrl),
+                    srcPath: {
+                        DecodedUrl: absoluteSourcePath
+                    },
+                    destPath: {
+                        DecodedUrl: absoluteTargetPath
+                    },
+                    overwrite: args.options.nameConflictBehavior === 'replace',
                     options: {
-                        "AllowSchemaMismatch": allowSchemaMismatch,
-                        "IgnoreVersionHistory": true,
-                        "IsMoveMode": true
+                        KeepBoth: args.options.nameConflictBehavior === 'rename',
+                        ShouldBypassSharedLocks: !!args.options.bypassSharedLock,
+                        RetainEditorAndModifiedOnMove: !!args.options.retainEditorAndModified
                     }
-                },
-                responseType: 'json'
+                }
             };
-            const jobInfo = await request.post(requestOptions);
-            const copyJobInfo = jobInfo.value[0];
-            const progressPollInterval = 1800; // 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);
-            });
+            await request.post(requestOptions);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    /**
-     * Checks if a file exists on the server relative url
-     */
-    fileExists(webUrl, sourceUrl) {
-        const requestUrl = `${webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting.encodeQueryParameter(sourceUrl)}')/`;
+    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 file with ID '${options.sourceId}'...`);
+        }
         const requestOptions = {
-            url: requestUrl,
-            method: 'GET',
+            url: `${options.webUrl}/_api/Web/GetFileById('${options.sourceId}')?$select=ServerRelativePath`,
             headers: {
-                'accept': 'application/json;odata=nometadata'
+                accept: 'application/json;odata=nometadata'
             },
             responseType: 'json'
         };
-        return request.get(requestOptions);
+        const file = await request.get(requestOptions);
+        return file.ServerRelativePath.DecodedUrl;
     }
-    /**
-     * Moves file in the site recycle bin
-     */
-    async recycleFile(tenantUrl, targetUrl, filename, logger) {
-        const targetFolderAbsoluteUrl = urlUtil.urlCombine(tenantUrl, targetUrl);
-        // since the target WebFullUrl is unknown we can use getRequestDigest
-        // to get it from target folder absolute url.
-        // Similar approach used here Microsoft.SharePoint.Client.Web.WebUrlFromFolderUrlDirect
-        const contextResponse = await spo.getRequestDigest(targetFolderAbsoluteUrl);
-        if (this.debug) {
-            await logger.logToStderr(`contextResponse.WebFullUrl: ${contextResponse.WebFullUrl}`);
-        }
-        const targetFileServerRelativeUrl = `${urlUtil.getServerRelativePath(contextResponse.WebFullUrl, targetUrl)}/${filename}`;
-        const removeOptions = {
-            webUrl: contextResponse.WebFullUrl,
-            url: targetFileServerRelativeUrl,
-            recycle: true,
-            force: true,
-            debug: this.debug,
-            verbose: this.verbose
-        };
-        try {
-            await Cli.executeCommand(removeCommand, { options: { ...removeOptions, _: [] } });
-        }
-        catch (err) {
-            if (err !== undefined && err.message !== undefined && err.message.includes('does not exist')) {
-            }
-            else {
-                throw err;
-            }
-        }
+    getAbsoluteUrl(webUrl, url) {
+        return url.startsWith('https://') ? url : urlUtil.getAbsoluteUrl(webUrl, url);
     }
 }
 _SpoFileMoveCommand_instances = new WeakSet(), _SpoFileMoveCommand_initTelemetry = function _SpoFileMoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            deleteIfAlreadyExists: args.options.deleteIfAlreadyExists || false,
-            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
         });
     });
 }, _SpoFileMoveCommand_initOptions = function _SpoFileMoveCommand_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: '--deleteIfAlreadyExists'
+        option: '--newName [newName]'
+    }, {
+        option: '--nameConflictBehavior [nameConflictBehavior]',
+        autocomplete: this.nameConflictBehaviorOptions
     }, {
-        option: '--allowSchemaMismatch'
+        option: '--retainEditorAndModified'
+    }, {
+        option: '--bypassSharedLock'
     });
 }, _SpoFileMoveCommand_initValidators = function _SpoFileMoveCommand_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;
+    });
+}, _SpoFileMoveCommand_initOptionSets = function _SpoFileMoveCommand_initOptionSets() {
+    this.optionSets.push({ options: ['sourceUrl', 'sourceId'] });
 };
 export default new SpoFileMoveCommand();
 //# sourceMappingURL=file-move.js.map

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

@@ -43,7 +43,7 @@ class SpoFileRemoveCommand extends SpoCommand {
             }
             else {
                 const serverRelativePath = urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
-                requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting.encodeQueryParameter(serverRelativePath)}')`;
+                requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(serverRelativePath)}')`;
             }
             if (args.options.recycle) {
                 requestUrl += `/recycle()`;
@@ -73,7 +73,7 @@ class SpoFileRemoveCommand extends SpoCommand {
                 type: 'confirm',
                 name: 'continue',
                 default: false,
-                message: `Are you sure you want to ${args.options.recycle ? "recycle" : "remove"} the file ${args.options.id || args.options.url} located in site ${args.options.webUrl}?`
+                message: `Are you sure you want to ${args.options.recycle ? 'recycle' : 'remove'} the file ${args.options.id || args.options.url} located in site ${args.options.webUrl}?`
             });
             if (result.continue) {
                 await removeFile();
@@ -84,10 +84,10 @@ class SpoFileRemoveCommand extends SpoCommand {
 _SpoFileRemoveCommand_instances = new WeakSet(), _SpoFileRemoveCommand_initTelemetry = function _SpoFileRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            id: (!(!args.options.id)).toString(),
-            url: (!(!args.options.url)).toString(),
-            recycle: (!(!args.options.recycle)).toString(),
-            force: (!(!args.options.force)).toString()
+            id: typeof args.options.id !== 'undefined',
+            url: typeof args.options.url !== 'undefined',
+            recycle: !!args.options.recycle,
+            force: !!args.options.force
         });
     });
 }, _SpoFileRemoveCommand_initOptions = function _SpoFileRemoveCommand_initOptions() {

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

@@ -41,7 +41,7 @@ class SpoFileRenameCommand extends SpoCommand {
                     }]
             };
             const requestOptions = {
-                url: `${webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting.encodeQueryParameter(originalFileServerRelativePath)}')/ListItemAllFields/ValidateUpdateListItem()`,
+                url: `${webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(originalFileServerRelativePath)}')/ListItemAllFields/ValidateUpdateListItem()`,
                 headers: {
                     'accept': 'application/json;odata=nometadata'
                 },
@@ -56,7 +56,7 @@ class SpoFileRenameCommand extends SpoCommand {
         }
     }
     async getFile(originalFileServerRelativeUrl, webUrl) {
-        const requestUrl = `${webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting.encodeQueryParameter(originalFileServerRelativeUrl)}')?$select=UniqueId`;
+        const requestUrl = `${webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(originalFileServerRelativeUrl)}')?$select=UniqueId`;
         const requestOptions = {
             url: requestUrl,
             headers: {

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

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