@pnp/cli-microsoft365 7.0.0-beta.9229cf8 → 7.0.0-beta.99e75a7

package/dist/m365/spfx/commands/spfx-doctor.js

@@ -603,31 +603,21 @@ class SpfxDoctorCommand extends BaseProjectCommand {
             this.handleRejectedPromise(err);
         }
     }
-    checkSharePointCompatibility(spfxVersion, prerequisites, args, fixes, logger) {
-        return new Promise(async (resolve, reject) => {
-            if (args.options.env) {
-                const sp = this.spVersionStringToEnum(args.options.env);
-                if ((prerequisites.sp & sp) === sp) {
-                    await logger.log(formatting.getStatus(CheckStatus.Success, `Supported in ${SharePointVersion[sp]}`));
-                    resolve();
-                }
-                else {
-                    await logger.log(formatting.getStatus(CheckStatus.Failure, `Not supported in ${SharePointVersion[sp]}`));
-                    fixes.push(`Use SharePoint Framework v${(sp === SharePointVersion.SP2016 ? '1.1' : '1.4.1')}`);
-                    reject(`SharePoint Framework v${spfxVersion} is not supported in ${SharePointVersion[sp]}`);
-                }
-            }
-            else {
-                resolve();
+    async checkSharePointCompatibility(spfxVersion, prerequisites, args, fixes, logger) {
+        if (args.options.env) {
+            const sp = this.spVersionStringToEnum(args.options.env);
+            if ((prerequisites.sp & sp) === sp) {
+                await logger.log(formatting.getStatus(CheckStatus.Success, `Supported in ${SharePointVersion[sp]}`));
+                return;
             }
-        });
+            await logger.log(formatting.getStatus(CheckStatus.Failure, `Not supported in ${SharePointVersion[sp]}`));
+            fixes.push(`Use SharePoint Framework v${(sp === SharePointVersion.SP2016 ? '1.1' : '1.4.1')}`);
+            throw `SharePoint Framework v${spfxVersion} is not supported in ${SharePointVersion[sp]}`;
+        }
     }
-    checkNodeVersion(prerequisites, fixes, logger) {
-        return Promise
-            .resolve(this.getNodeVersion())
-            .then((nodeVersion) => {
-            this.checkStatus('Node', nodeVersion, prerequisites.node, OptionalOrRequired.Required, fixes, logger);
-        });
+    async checkNodeVersion(prerequisites, fixes, logger) {
+        const nodeVersion = this.getNodeVersion();
+        this.checkStatus('Node', nodeVersion, prerequisites.node, OptionalOrRequired.Required, fixes, logger);
     }
     async checkSharePointFrameworkVersion(spfxVersionRequested, fixes, logger) {
         let spfxVersionDetected = await this.getSPFxVersionFromYoRcFile(logger);
@@ -646,54 +636,42 @@ class SpfxDoctorCommand extends BaseProjectCommand {
             fixes.push(versionCheck.fix);
         }
     }
-    checkYo(prerequisites, fixes, logger) {
-        return this
-            .getPackageVersion('yo', PackageSearchMode.GlobalOnly, HandlePromise.Continue, logger)
-            .then(async (yoVersion) => {
-            if (yoVersion) {
-                this.checkStatus('yo', yoVersion, prerequisites.yo, OptionalOrRequired.Required, fixes, logger);
-            }
-            else {
-                await logger.log(formatting.getStatus(CheckStatus.Failure, `yo not found`));
-                fixes.push(prerequisites.yo.fix);
-            }
-        });
+    async checkYo(prerequisites, fixes, logger) {
+        const yoVersion = await this.getPackageVersion('yo', PackageSearchMode.GlobalOnly, HandlePromise.Continue, logger);
+        if (yoVersion) {
+            this.checkStatus('yo', yoVersion, prerequisites.yo, OptionalOrRequired.Required, fixes, logger);
+        }
+        else {
+            await logger.log(formatting.getStatus(CheckStatus.Failure, `yo not found`));
+            fixes.push(prerequisites.yo.fix);
+        }
     }
-    checkGulpCli(prerequisites, fixes, logger) {
-        return this
-            .getPackageVersion('gulp-cli', PackageSearchMode.GlobalOnly, HandlePromise.Continue, logger)
-            .then(async (gulpCliVersion) => {
-            if (gulpCliVersion) {
-                this.checkStatus('gulp-cli', gulpCliVersion, prerequisites.gulpCli, OptionalOrRequired.Required, fixes, logger);
-            }
-            else {
-                await logger.log(formatting.getStatus(CheckStatus.Failure, `gulp-cli not found`));
-                fixes.push(prerequisites.gulpCli.fix);
-            }
-        });
+    async checkGulpCli(prerequisites, fixes, logger) {
+        const gulpCliVersion = await this.getPackageVersion('gulp-cli', PackageSearchMode.GlobalOnly, HandlePromise.Continue, logger);
+        if (gulpCliVersion) {
+            this.checkStatus('gulp-cli', gulpCliVersion, prerequisites.gulpCli, OptionalOrRequired.Required, fixes, logger);
+        }
+        else {
+            await logger.log(formatting.getStatus(CheckStatus.Failure, `gulp-cli not found`));
+            fixes.push(prerequisites.gulpCli.fix);
+        }
     }
-    checkGulp(fixes, logger) {
-        return this
-            .getPackageVersion('gulp', PackageSearchMode.GlobalOnly, HandlePromise.Continue, logger)
-            .then(async (gulpVersion) => {
-            if (gulpVersion) {
-                await logger.log(formatting.getStatus(CheckStatus.Failure, `gulp should be removed`));
-                fixes.push('npm un -g gulp');
-            }
-        });
+    async checkGulp(fixes, logger) {
+        const gulpVersion = await this.getPackageVersion('gulp', PackageSearchMode.GlobalOnly, HandlePromise.Continue, logger);
+        if (gulpVersion) {
+            await logger.log(formatting.getStatus(CheckStatus.Failure, `gulp should be removed`));
+            fixes.push('npm un -g gulp');
+        }
     }
-    checkTypeScript(fixes, logger) {
-        return this
-            .getPackageVersion('typescript', PackageSearchMode.LocalOnly, HandlePromise.Continue, logger)
-            .then(async (typeScriptVersion) => {
-            if (typeScriptVersion) {
-                await logger.log(formatting.getStatus(CheckStatus.Failure, `typescript v${typeScriptVersion} installed in the project`));
-                fixes.push('npm un typescript');
-            }
-            else {
-                await logger.log(formatting.getStatus(CheckStatus.Success, `bundled typescript used`));
-            }
-        });
+    async checkTypeScript(fixes, logger) {
+        const typeScriptVersion = await this.getPackageVersion('typescript', PackageSearchMode.LocalOnly, HandlePromise.Continue, logger);
+        if (typeScriptVersion) {
+            await logger.log(formatting.getStatus(CheckStatus.Failure, `typescript v${typeScriptVersion} installed in the project`));
+            fixes.push('npm un typescript');
+        }
+        else {
+            await logger.log(formatting.getStatus(CheckStatus.Success, `bundled typescript used`));
+        }
     }
     spVersionStringToEnum(sp) {
         return SharePointVersion[sp.toUpperCase()];
@@ -742,43 +720,35 @@ class SpfxDoctorCommand extends BaseProjectCommand {
             }
         }
     }
-    getPackageVersion(packageName, searchMode, handlePromise, logger) {
-        return new Promise((resolve, reject) => {
-            const args = ['ls', packageName, '--depth=0', '--json'];
-            if (searchMode === PackageSearchMode.GlobalOnly) {
+    async getPackageVersion(packageName, searchMode, handlePromise, logger) {
+        const args = ['ls', packageName, '--depth=0', '--json'];
+        if (searchMode === PackageSearchMode.GlobalOnly) {
+            args.push('-g');
+        }
+        let version;
+        try {
+            version = await this.getPackageVersionFromNpm(args, logger);
+        }
+        catch {
+            if (searchMode === PackageSearchMode.LocalAndGlobal) {
                 args.push('-g');
+                version = await this.getPackageVersionFromNpm(args, logger);
             }
-            this
-                .getPackageVersionFromNpm(args, logger)
-                .then((version) => {
-                return Promise.resolve(version);
-            })
-                .catch(() => {
-                if (searchMode === PackageSearchMode.LocalAndGlobal) {
-                    args.push('-g');
-                    return this.getPackageVersionFromNpm(args, logger);
-                }
-                else {
-                    return Promise.resolve('');
-                }
-            })
-                .then((version) => {
-                if (version) {
-                    resolve(version);
-                }
-                else {
-                    if (handlePromise === HandlePromise.Continue) {
-                        resolve('');
-                    }
-                    else {
-                        reject();
-                    }
-                }
-            })
-                .catch((err) => {
-                reject(err);
-            });
-        });
+            else {
+                version = '';
+            }
+        }
+        if (version) {
+            return version;
+        }
+        else {
+            if (handlePromise === HandlePromise.Continue) {
+                return '';
+            }
+            else {
+                throw new Error();
+            }
+        }
     }
     getPackageVersionFromNpm(args, logger) {
         return new Promise(async (resolve, reject) => {

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

@@ -57,7 +57,7 @@ class SpoFileMoveCommand extends SpoCommand {
             const requestOptions = {
                 url: requestUrl,
                 headers: {
-                    'accept': 'application/json;odata=nometadata'
+                    accept: 'application/json;odata=nometadata'
                 },
                 data: {
                     exportObjectUris: [sourceAbsoluteUrl],
@@ -96,7 +96,7 @@ class SpoFileMoveCommand extends SpoCommand {
      * Checks if a file exists on the server relative url
      */
     fileExists(webUrl, sourceUrl) {
-        const requestUrl = `${webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting.encodeQueryParameter(sourceUrl)}')/`;
+        const requestUrl = `${webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(sourceUrl)}')/`;
         const requestOptions = {
             url: requestUrl,
             method: 'GET',

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`,

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

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

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

@@ -55,7 +55,7 @@ class SpoFileRoleAssignmentAddCommand extends SpoCommand {
     }
     async addRoleAssignment(fileUrl, webUrl, principalId, roleDefinitionId) {
         const requestOptions = {
-            url: `${webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting.encodeQueryParameter(fileUrl)}')/ListItemAllFields/roleassignments/addroleassignment(principalid='${principalId}',roledefid='${roleDefinitionId}')`,
+            url: `${webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(fileUrl)}')/ListItemAllFields/roleassignments/addroleassignment(principalid='${principalId}',roledefid='${roleDefinitionId}')`,
             method: 'POST',
             headers: {
                 'accept': 'application/json;odata=nometadata',

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

@@ -48,7 +48,7 @@ class SpoFileRoleAssignmentRemoveCommand extends SpoCommand {
                 }
                 const serverRelativePath = urlUtil.getServerRelativePath(args.options.webUrl, fileURL);
                 const requestOptions = {
-                    url: `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting.encodeQueryParameter(serverRelativePath)}')/ListItemAllFields/roleassignments/removeroleassignment(principalid='${principalId}')`,
+                    url: `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(serverRelativePath)}')/ListItemAllFields/roleassignments/removeroleassignment(principalid='${principalId}')`,
                     headers: {
                         accept: 'application/json;odata=nometadata'
                     },

package/dist/m365/spo/commands/file/file-roleinheritance-break.js

@@ -36,7 +36,7 @@ class SpoFileRoleInheritanceBreakCommand extends SpoCommand {
                 const fileURL = await this.getFileURL(args);
                 const keepExistingPermissions = !args.options.clearExistingPermissions;
                 const requestOptions = {
-                    url: `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting.encodeQueryParameter(fileURL)}')/ListItemAllFields/breakroleinheritance(${keepExistingPermissions})`,
+                    url: `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(fileURL)}')/ListItemAllFields/breakroleinheritance(${keepExistingPermissions})`,
                     headers: {
                         accept: 'application/json;odata=nometadata'
                     },

package/dist/m365/spo/commands/file/file-roleinheritance-reset.js

@@ -35,7 +35,7 @@ class SpoFileRoleInheritanceResetCommand extends SpoCommand {
             try {
                 const fileURL = await this.getFileURL(args);
                 const requestOptions = {
-                    url: `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting.encodeQueryParameter(fileURL)}')/ListItemAllFields/resetroleinheritance`,
+                    url: `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(fileURL)}')/ListItemAllFields/resetroleinheritance`,
                     headers: {
                         accept: 'application/json;odata=nometadata'
                     },

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()`;