@pnp/cli-microsoft365 7.0.0-beta.7f98bac → 7.0.0-beta.8726fe8

package/dist/m365/spo/commands/commandset/commandset-list.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 _SpoCommandSetListCommand_instances, _SpoCommandSetListCommand_initTelemetry, _SpoCommandSetListCommand_initOptions, _SpoCommandSetListCommand_initValidators;
+var _SpoCommandSetListCommand_instances, _a, _SpoCommandSetListCommand_initTelemetry, _SpoCommandSetListCommand_initOptions, _SpoCommandSetListCommand_initValidators;
 import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -38,7 +38,7 @@ class SpoCommandSetListCommand extends SpoCommand {
         }
     }
 }
-_SpoCommandSetListCommand_instances = new WeakSet(), _SpoCommandSetListCommand_initTelemetry = function _SpoCommandSetListCommand_initTelemetry() {
+_a = SpoCommandSetListCommand, _SpoCommandSetListCommand_instances = new WeakSet(), _SpoCommandSetListCommand_initTelemetry = function _SpoCommandSetListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             scope: args.options.scope || 'All'
@@ -49,12 +49,12 @@ _SpoCommandSetListCommand_instances = new WeakSet(), _SpoCommandSetListCommand_i
         option: '-u, --webUrl <webUrl>'
     }, {
         option: '-s, --scope [scope]',
-        autocomplete: SpoCommandSetListCommand.scopes
+        autocomplete: _a.scopes
     });
 }, _SpoCommandSetListCommand_initValidators = function _SpoCommandSetListCommand_initValidators() {
     this.validators.push(async (args) => {
-        if (args.options.scope && SpoCommandSetListCommand.scopes.indexOf(args.options.scope) < 0) {
-            return `${args.options.scope} is not a valid scope. Valid scopes are ${SpoCommandSetListCommand.scopes.join(', ')}`;
+        if (args.options.scope && _a.scopes.indexOf(args.options.scope) < 0) {
+            return `${args.options.scope} is not a valid scope. Valid scopes are ${_a.scopes.join(', ')}`;
         }
         return validation.isValidSharePointUrl(args.options.webUrl);
     });

package/dist/m365/spo/commands/commandset/commandset-remove.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 _SpoCommandSetRemoveCommand_instances, _SpoCommandSetRemoveCommand_initTelemetry, _SpoCommandSetRemoveCommand_initOptions, _SpoCommandSetRemoveCommand_initValidators, _SpoCommandSetRemoveCommand_initOptionSets;
+var _SpoCommandSetRemoveCommand_instances, _a, _SpoCommandSetRemoveCommand_initTelemetry, _SpoCommandSetRemoveCommand_initOptions, _SpoCommandSetRemoveCommand_initValidators, _SpoCommandSetRemoveCommand_initOptionSets;
 import commands from '../../commands.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -63,7 +63,8 @@ class SpoCommandSetRemoveCommand extends SpoCommand {
             throw `No user commandsets with ${options.title && `title '${options.title}'` || options.clientSideComponentId && `ClientSideComponentId '${options.clientSideComponentId}'` || options.id && `id '${options.id}'`} found`;
         }
         if (commandSets.length > 1) {
-            throw `Multiple user commandsets with ${options.title ? `title '${options.title}'` : `ClientSideComponentId '${options.clientSideComponentId}'`} found. Please disambiguate using IDs: ${commandSets.map((commandSet) => commandSet.Id).join(', ')}`;
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('Id', commandSets);
+            return await Cli.handleMultipleResultsFound(`Multiple user commandsets with ${options.title ? `title '${options.title}'` : `ClientSideComponentId '${options.clientSideComponentId}'`} found.`, resultAsKeyValuePair);
         }
         return commandSets[0];
     }
@@ -87,7 +88,7 @@ class SpoCommandSetRemoveCommand extends SpoCommand {
         }
     }
 }
-_SpoCommandSetRemoveCommand_instances = new WeakSet(), _SpoCommandSetRemoveCommand_initTelemetry = function _SpoCommandSetRemoveCommand_initTelemetry() {
+_a = SpoCommandSetRemoveCommand, _SpoCommandSetRemoveCommand_instances = new WeakSet(), _SpoCommandSetRemoveCommand_initTelemetry = function _SpoCommandSetRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             title: typeof args.options.title !== 'undefined',
@@ -107,7 +108,7 @@ _SpoCommandSetRemoveCommand_instances = new WeakSet(), _SpoCommandSetRemoveComma
     }, {
         option: '-c, --clientSideComponentId  [clientSideComponentId]'
     }, {
-        option: '-s, --scope [scope]', autocomplete: SpoCommandSetRemoveCommand.scopes
+        option: '-s, --scope [scope]', autocomplete: _a.scopes
     }, {
         option: '-f, --force'
     });
@@ -119,8 +120,8 @@ _SpoCommandSetRemoveCommand_instances = new WeakSet(), _SpoCommandSetRemoveComma
         if (args.options.clientSideComponentId && !validation.isValidGuid(args.options.clientSideComponentId)) {
             return `${args.options.clientSideComponentId} is not a valid GUID`;
         }
-        if (args.options.scope && SpoCommandSetRemoveCommand.scopes.indexOf(args.options.scope) < 0) {
-            return `${args.options.scope} is not a valid scope. Allowed values are ${SpoCommandSetRemoveCommand.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(', ')}`;
         }
         return validation.isValidSharePointUrl(args.options.webUrl);
     });

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

@@ -3,13 +3,14 @@ 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';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
+import { Cli } from '../../../../cli/Cli.js';
 class SpoCommandSetSetCommand extends SpoCommand {
     get name() {
         return commands.COMMANDSET_SET;
@@ -84,7 +85,8 @@ class SpoCommandSetSetCommand extends SpoCommand {
             throw `No user commandsets with ${options.title && `title '${options.title}'` || options.clientSideComponentId && `ClientSideComponentId '${options.clientSideComponentId}'` || options.id && `id '${options.id}'`} found`;
         }
         if (commandSets.length > 1) {
-            throw `Multiple user commandsets with ${options.title ? `title '${options.title}'` : `ClientSideComponentId '${options.clientSideComponentId}'`} found. Please disambiguate using IDs: ${commandSets.map((commandSet) => commandSet.Id).join(', ')}`;
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('Id', commandSets);
+            return await Cli.handleMultipleResultsFound(`Multiple user commandsets with ${options.title ? `title '${options.title}'` : `ClientSideComponentId '${options.clientSideComponentId}'`} found.`, resultAsKeyValuePair);
         }
         return commandSets[0];
     }
@@ -109,7 +111,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 +138,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 +157,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/customaction/customaction-get.js

@@ -4,6 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoCustomActionGetCommand_instances, _SpoCustomActionGetCommand_initTelemetry, _SpoCustomActionGetCommand_initOptions, _SpoCustomActionGetCommand_initValidators, _SpoCustomActionGetCommand_initOptionSets;
+import { Cli } from '../../../../cli/Cli.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
@@ -71,7 +72,8 @@ class SpoCustomActionGetCommand extends SpoCommand {
             if (customActions.length === 0) {
                 throw `No user custom action with title '${options.title}' found`;
             }
-            throw `Multiple user custom actions with title '${options.title}' found. Please disambiguate using IDs: ${customActions.map(a => a.Id).join(', ')}`;
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('Id', customActions);
+            return await Cli.handleMultipleResultsFound(`Multiple user custom actions with title '${options.title}' found.`, resultAsKeyValuePair);
         }
         else {
             const customActions = await spo.getCustomActions(options.webUrl, options.scope, `ClientSideComponentId eq guid'${options.clientSideComponentId}'`);
@@ -79,7 +81,8 @@ class SpoCustomActionGetCommand extends SpoCommand {
                 throw `No user custom action with ClientSideComponentId '${options.clientSideComponentId}' found`;
             }
             if (customActions.length > 1) {
-                throw `Multiple user custom actions with ClientSideComponentId '${options.clientSideComponentId}' found. Please disambiguate using IDs: ${customActions.map((customAction) => customAction.Id).join(', ')}`;
+                const resultAsKeyValuePair = formatting.convertArrayToHashTable('Id', customActions);
+                return await Cli.handleMultipleResultsFound(`Multiple user custom actions with ClientSideComponentId '${options.clientSideComponentId}' found.`, resultAsKeyValuePair);
             }
             return customActions[0];
         }

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

@@ -72,7 +72,9 @@ class SpoCustomActionRemoveCommand extends SpoCommand {
         if (customActions.length === 0) {
             throw `No user custom action with title '${options.title}' found`;
         }
-        throw `Multiple user custom actions with title '${options.title}' found. Please disambiguate using IDs: ${customActions.map(a => a.Id).join(', ')}`;
+        const resultAsKeyValuePair = formatting.convertArrayToHashTable('Id', customActions);
+        const result = await Cli.handleMultipleResultsFound(`Multiple user custom actions with title '${options.title}' found.`, resultAsKeyValuePair);
+        return result.Id;
     }
     async removeScopedCustomAction(options) {
         const customActionId = await this.getCustomActionId(options);

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

@@ -4,6 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoEventreceiverGetCommand_instances, _SpoEventreceiverGetCommand_initTelemetry, _SpoEventreceiverGetCommand_initOptions, _SpoEventreceiverGetCommand_initValidators, _SpoEventreceiverGetCommand_initOptionSets;
+import { Cli } from '../../../../cli/Cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
@@ -75,7 +76,8 @@ class SpoEventreceiverGetCommand extends SpoCommand {
                 throw `The specified event receiver '${args.options.name}' does not exist.`;
             }
             if (res.value && res.value.length > 1) {
-                throw `Multiple event receivers with name '${args.options.name}' found: ${res.value.map(x => x.ReceiverId)}`;
+                const resultAsKeyValuePair = formatting.convertArrayToHashTable('ReceiverId', res.value);
+                return await Cli.handleMultipleResultsFound(`Multiple event receivers with name '${args.options.name}' found.`, resultAsKeyValuePair);
             }
             return res.value[0];
         }

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-get.js

@@ -103,6 +103,9 @@ class SpoFileGetCommand extends SpoCommand {
                             fileProperties.ListItemAllFields.RoleAssignments = response.value;
                         }
                     }
+                    if (args.options.asListItem) {
+                        delete fileProperties.ListItemAllFields.ID;
+                    }
                     await logger.log(args.options.asListItem ? fileProperties.ListItemAllFields : fileProperties);
                 }
             }
@@ -115,20 +118,20 @@ class SpoFileGetCommand extends SpoCommand {
 _SpoFileGetCommand_instances = new WeakSet(), _SpoFileGetCommand_initTelemetry = function _SpoFileGetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            id: (!(!args.options.id)).toString(),
-            url: (!(!args.options.url)).toString(),
-            asString: args.options.asString || false,
-            asListItem: args.options.asListItem || false,
-            asFile: args.options.asFile || false,
-            path: (!(!args.options.path)).toString(),
+            id: typeof args.options.id !== 'undefined',
+            url: typeof args.options.url !== 'undefined',
+            asString: !!args.options.asString,
+            asListItem: !!args.options.asListItem,
+            asFile: !!args.options.asFile,
+            path: typeof args.options.path !== 'undefined',
             withPermissions: !!args.options.withPermissions
         });
     });
 }, _SpoFileGetCommand_initOptions = function _SpoFileGetCommand_initOptions() {
     this.options.unshift({
-        option: '-w, --webUrl <webUrl>'
+        option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-u, --url [url]'
+        option: '--url [url]'
     }, {
         option: '-i, --id [id]'
     }, {

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'