@pnp/cli-microsoft365 5.9.0 → 6.0.0-beta.063a75a

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

@@ -40,74 +40,57 @@ class SpoEventreceiverRemoveCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            try {
-                const getEventReceiversOutput = yield this.getEventReceivers(args.options);
-                const eventReceivers = JSON.parse(getEventReceiversOutput.stdout);
-                if (!eventReceivers.length) {
-                    throw Error(`Specified event receiver with ${args.options.id !== undefined ? `id ${args.options.id}` : `name ${args.options.name}`} cannot be found`);
+            if (args.options.confirm) {
+                yield this.removeEventReceiver(args.options);
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove event receiver with ${args.options.id ? `id ${args.options.id}` : `name ${args.options.name}`}?`
+                });
+                if (result.continue) {
+                    yield this.removeEventReceiver(args.options);
                 }
-                if (eventReceivers.length > 1) {
-                    throw Error(`Multiple eventreceivers with ${args.options.id !== undefined ? `id ${args.options.id} found` : `name ${args.options.name}, ids: ${eventReceivers.map(x => x.ReceiverId)} found`}`);
+            }
+        });
+    }
+    removeEventReceiver(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                let requestUrl = `${options.webUrl}/_api/${options.scope || 'web'}`;
+                if (options.listId) {
+                    requestUrl += `/lists('${options.listId}')`;
                 }
-                if (args.options.confirm) {
-                    yield this.removeEventReceiver(args.options);
+                else if (options.listTitle) {
+                    requestUrl += `/lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(options.listTitle)}')`;
                 }
-                else {
-                    const result = yield Cli_1.Cli.prompt({
-                        type: 'confirm',
-                        name: 'continue',
-                        default: false,
-                        message: `Are you sure you want to remove event receiver with ${args.options.id !== undefined ? `id ${args.options.id}` : `name ${args.options.name}`}?`
-                    });
-                    if (result.continue) {
-                        yield this.removeEventReceiver(args.options);
-                    }
+                else if (options.listUrl) {
+                    const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(options.webUrl, options.listUrl);
+                    requestUrl += `/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
                 }
+                const rerId = yield this.getEventReceiverId(options);
+                requestUrl += `/eventreceivers('${rerId}')`;
+                const requestOptions = {
+                    url: requestUrl,
+                    headers: {
+                        'accept': 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                yield request_1.default.delete(requestOptions);
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);
             }
         });
     }
-    removeEventReceiver(options) {
+    getEventReceiverId(options) {
         return __awaiter(this, void 0, void 0, function* () {
-            let requestUrl = `${options.webUrl}/_api/`;
-            let listUrl = '';
-            let filter = '?$filter=';
-            if (options.listId) {
-                listUrl = `lists(guid'${formatting_1.formatting.encodeQueryParameter(options.listId)}')/`;
-            }
-            else if (options.listTitle) {
-                listUrl = `lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(options.listTitle)}')/`;
-            }
-            else if (options.listUrl) {
-                const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(options.webUrl, options.listUrl);
-                listUrl = `GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
-            }
-            if (!options.scope || options.scope === 'web') {
-                requestUrl += `web/${listUrl}eventreceivers`;
-            }
-            else {
-                requestUrl += 'site/eventreceivers';
-            }
             if (options.id) {
-                filter += `receiverid eq (guid'${options.id}')`;
+                return options.id;
             }
-            else {
-                filter += `receivername eq '${options.name}'`;
-            }
-            const requestOptions = {
-                url: requestUrl + filter,
-                headers: {
-                    'accept': 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            yield request_1.default.delete(requestOptions);
-        });
-    }
-    getEventReceivers(options) {
-        return __awaiter(this, void 0, void 0, function* () {
             const getOptions = {
                 webUrl: options.webUrl,
                 listId: options.listId,
@@ -119,7 +102,9 @@ class SpoEventreceiverRemoveCommand extends SpoCommand_1.default {
                 debug: this.debug,
                 verbose: this.verbose
             };
-            return yield Cli_1.Cli.executeCommandWithOutput(getCommand, { options: Object.assign(Object.assign({}, getOptions), { _: [] }) });
+            const commandOutput = yield Cli_1.Cli.executeCommandWithOutput(getCommand, { options: Object.assign(Object.assign({}, getOptions), { _: [] }) });
+            const eventReceiver = JSON.parse(commandOutput.stdout);
+            return eventReceiver.ReceiverId;
         });
     }
 }
@@ -129,10 +114,10 @@ _SpoEventreceiverRemoveCommand_instances = new WeakSet(), _SpoEventreceiverRemov
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
             listUrl: typeof args.options.listUrl !== 'undefined',
-            scope: typeof args.options.scope !== 'undefined',
+            scope: args.options.scope || 'web',
             id: typeof args.options.id !== 'undefined',
             name: typeof args.options.name !== 'undefined',
-            confirm: (!(!args.options.confirm)).toString()
+            confirm: !!args.options.confirm
         });
     });
 }, _SpoEventreceiverRemoveCommand_initOptions = function _SpoEventreceiverRemoveCommand_initOptions() {
@@ -176,7 +161,7 @@ _SpoEventreceiverRemoveCommand_instances = new WeakSet(), _SpoEventreceiverRemov
         return true;
     }));
 }, _SpoEventreceiverRemoveCommand_initOptionSets = function _SpoEventreceiverRemoveCommand_initOptionSets() {
-    this.optionSets.push(['name', 'id']);
+    this.optionSets.push({ options: ['name', 'id'] });
 };
 module.exports = new SpoEventreceiverRemoveCommand();
 //# sourceMappingURL=eventreceiver-remove.js.map

package/dist/m365/spo/commands/feature/feature-disable.js

@@ -44,9 +44,9 @@ class SpoFeatureDisableCommand extends SpoCommand_1.default {
                 force = false;
             }
             if (this.verbose) {
-                logger.logToStderr(`Disabling feature '${args.options.featureId}' on scope '${scope}' for url '${args.options.url}' (force='${force}')...`);
+                logger.logToStderr(`Disabling feature '${args.options.id}' on scope '${scope}' for url '${args.options.webUrl}' (force='${force}')...`);
             }
-            const url = `${args.options.url}/_api/${scope}/features/remove(featureId=guid'${args.options.featureId}',force=${force})`;
+            const url = `${args.options.webUrl}/_api/${scope}/features/remove(featureId=guid'${args.options.id}',force=${force})`;
             const requestOptions = {
                 url: url,
                 headers: {
@@ -71,9 +71,9 @@ _SpoFeatureDisableCommand_instances = new WeakSet(), _SpoFeatureDisableCommand_i
     });
 }, _SpoFeatureDisableCommand_initOptions = function _SpoFeatureDisableCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --url <url>'
+        option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-f, --featureId <id>'
+        option: '-i, --id <id>'
     }, {
         option: '-s, --scope [scope]',
         autocomplete: ['Site', 'Web']

package/dist/m365/spo/commands/feature/feature-enable.js

@@ -45,9 +45,9 @@ class SpoFeatureEnableCommand extends SpoCommand_1.default {
                 force = false;
             }
             if (this.verbose) {
-                logger.logToStderr(`Enabling feature '${args.options.featureId}' on scope '${scope}' for url '${args.options.url}' (force='${force}')...`);
+                logger.logToStderr(`Enabling feature '${args.options.id}' on scope '${scope}' for url '${args.options.webUrl}' (force='${force}')...`);
             }
-            const url = `${args.options.url}/_api/${scope}/features/add(featureId=guid'${args.options.featureId}',force=${force})`;
+            const url = `${args.options.webUrl}/_api/${scope}/features/add(featureId=guid'${args.options.id}',force=${force})`;
             const requestOptions = {
                 url: url,
                 headers: {
@@ -72,9 +72,9 @@ _SpoFeatureEnableCommand_instances = new WeakSet(), _SpoFeatureEnableCommand_ini
     });
 }, _SpoFeatureEnableCommand_initOptions = function _SpoFeatureEnableCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --url <url>'
+        option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-f, --featureId <id>'
+        option: '-i, --id <id>'
     }, {
         option: '-s, --scope [scope]',
         autocomplete: ['Site', 'Web']
@@ -88,7 +88,7 @@ _SpoFeatureEnableCommand_instances = new WeakSet(), _SpoFeatureEnableCommand_ini
                 return `${args.options.scope} is not a valid Feature scope. Allowed values are Site|Web`;
             }
         }
-        return validation_1.validation.isValidSharePointUrl(args.options.url);
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 }, _SpoFeatureEnableCommand_initTypes = function _SpoFeatureEnableCommand_initTypes() {
     this.types.string.push('scope', 's');

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

@@ -15,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoFeatureListCommand_instances, _SpoFeatureListCommand_initTelemetry, _SpoFeatureListCommand_initOptions, _SpoFeatureListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const request_1 = require("../../../../request");
+const odata_1 = require("../../../../utils/odata");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -36,17 +36,10 @@ class SpoFeatureListCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             const scope = (args.options.scope) ? args.options.scope : 'Web';
-            const requestOptions = {
-                url: `${args.options.url}/_api/${scope}/Features?$select=DisplayName,DefinitionId`,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
             try {
-                const features = yield request_1.default.get(requestOptions);
-                if (features.value && features.value.length > 0) {
-                    logger.log(features.value);
+                const features = yield odata_1.odata.getAllItems(`${args.options.webUrl}/_api/${scope}/Features?$select=DisplayName,DefinitionId`);
+                if (features && features.length > 0) {
+                    logger.log(features);
                 }
                 else {
                     if (this.verbose) {
@@ -68,7 +61,7 @@ _SpoFeatureListCommand_instances = new WeakSet(), _SpoFeatureListCommand_initTel
     });
 }, _SpoFeatureListCommand_initOptions = function _SpoFeatureListCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --url <url>'
+        option: '-u, --webUrl <webUrl>'
     }, {
         option: '-s, --scope [scope]',
         autocomplete: ['Site', 'Web']
@@ -81,7 +74,7 @@ _SpoFeatureListCommand_instances = new WeakSet(), _SpoFeatureListCommand_initTel
                 return `${args.options.scope} is not a valid Feature scope. Allowed values are Site|Web`;
             }
         }
-        return validation_1.validation.isValidSharePointUrl(args.options.url);
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 };
 module.exports = new SpoFeatureListCommand();

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

@@ -38,10 +38,6 @@ class SpoFieldGetCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (args.options.fieldTitle) {
-                args.options.title = args.options.fieldTitle;
-                this.warn(logger, `Option 'fieldTitle' is deprecated. Please use 'title' instead.`);
-            }
             let listRestUrl = '';
             if (args.options.listId) {
                 listRestUrl = `lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')/`;
@@ -98,8 +94,6 @@ _SpoFieldGetCommand_instances = new WeakSet(), _SpoFieldGetCommand_initTelemetry
         option: '--listUrl [listUrl]'
     }, {
         option: '-i, --id [id]'
-    }, {
-        option: '--fieldTitle [fieldTitle]'
     }, {
         option: '-t, --title [title]'
     });
@@ -118,7 +112,7 @@ _SpoFieldGetCommand_instances = new WeakSet(), _SpoFieldGetCommand_initTelemetry
         return true;
     }));
 }, _SpoFieldGetCommand_initOptionSets = function _SpoFieldGetCommand_initOptionSets() {
-    this.optionSets.push(['id', 'title', 'fieldTitle']);
+    this.optionSets.push({ options: ['id', 'title'] });
 };
 module.exports = new SpoFieldGetCommand();
 //# sourceMappingURL=field-get.js.map

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

@@ -15,8 +15,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoFieldListCommand_instances, _SpoFieldListCommand_initTelemetry, _SpoFieldListCommand_initOptions, _SpoFieldListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
+const odata_1 = require("../../../../utils/odata");
 const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
@@ -51,16 +51,9 @@ class SpoFieldListCommand extends SpoCommand_1.default {
                 const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
                 listUrl = `GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
             }
-            const requestOptions = {
-                url: `${args.options.webUrl}/_api/web/${listUrl}fields`,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
             try {
-                const res = yield request_1.default.get(requestOptions);
-                logger.log(res.value);
+                const res = yield odata_1.odata.getAllItems(`${args.options.webUrl}/_api/web/${listUrl}fields`);
+                logger.log(res);
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);

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

@@ -39,10 +39,6 @@ class SpoFieldRemoveCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (args.options.fieldTitle) {
-                args.options.title = args.options.fieldTitle;
-                this.warn(logger, `Option 'fieldTitle' is deprecated. Please use 'title' instead.`);
-            }
             let messageEnd;
             if (args.options.listId || args.options.listTitle) {
                 messageEnd = `in list ${args.options.listId || args.options.listTitle}`;
@@ -163,8 +159,6 @@ _SpoFieldRemoveCommand_instances = new WeakSet(), _SpoFieldRemoveCommand_initTel
         option: '--listUrl [listUrl]'
     }, {
         option: '-i, --id [id]'
-    }, {
-        option: '--fieldTitle [fieldTitle]'
     }, {
         option: '-t, --title [title]'
     }, {
@@ -187,7 +181,7 @@ _SpoFieldRemoveCommand_instances = new WeakSet(), _SpoFieldRemoveCommand_initTel
         return true;
     }));
 }, _SpoFieldRemoveCommand_initOptionSets = function _SpoFieldRemoveCommand_initOptionSets() {
-    this.optionSets.push(['id', 'title', 'fieldTitle', 'group']);
+    this.optionSets.push({ options: ['id', 'title', 'group'] });
 };
 module.exports = new SpoFieldRemoveCommand();
 //# sourceMappingURL=field-remove.js.map

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

@@ -43,9 +43,6 @@ class SpoFieldSetCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (args.options.name) {
-                this.warn(logger, `Option 'name' is deprecated. Please use 'title' instead.`);
-            }
             try {
                 const reqDigest = yield spo_1.spo.getRequestDigest(args.options.webUrl);
                 const requestDigest = reqDigest.FormDigestValue;
@@ -123,7 +120,6 @@ class SpoFieldSetCommand extends SpoCommand_1.default {
             'listTitle',
             'listUrl',
             'id',
-            'name',
             'title',
             'updateExistingLists',
             'debug',
@@ -142,7 +138,6 @@ _SpoFieldSetCommand_instances = new WeakSet(), _SpoFieldSetCommand_initTelemetry
         Object.assign(this.telemetryProperties, {
             id: typeof args.options.id !== 'undefined',
             title: typeof args.options.title !== 'undefined',
-            name: typeof args.options.name !== 'undefined',
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
             listUrl: typeof args.options.listUrl !== 'undefined',
@@ -160,8 +155,6 @@ _SpoFieldSetCommand_instances = new WeakSet(), _SpoFieldSetCommand_initTelemetry
         option: '--listUrl [listUrl]'
     }, {
         option: '-i, --id [id]'
-    }, {
-        option: '-n, --name [name]'
     }, {
         option: '-t, --title [title]'
     }, {
@@ -188,7 +181,7 @@ _SpoFieldSetCommand_instances = new WeakSet(), _SpoFieldSetCommand_initTelemetry
         return true;
     }));
 }, _SpoFieldSetCommand_initOptionSets = function _SpoFieldSetCommand_initOptionSets() {
-    this.optionSets.push(['id', 'title', 'name']);
+    this.optionSets.push({ options: ['id', 'title'] });
 };
 module.exports = new SpoFieldSetCommand();
 //# sourceMappingURL=field-set.js.map

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

@@ -19,6 +19,7 @@ const fs = require("fs");
 const path = require("path");
 const uuid_1 = require("uuid");
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const fsUtil_1 = require("../../../../utils/fsUtil");
 const spo_1 = require("../../../../utils/spo");
 const urlUtil_1 = require("../../../../utils/urlUtil");
@@ -65,7 +66,7 @@ class SpoFileAddCommand extends SpoCommand_1.default {
             try {
                 try {
                     const requestOptions = {
-                        url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(folderPath)}')`,
+                        url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(folderPath)}')`,
                         headers: {
                             'accept': 'application/json;odata=nometadata'
                         }
@@ -99,7 +100,7 @@ class SpoFileAddCommand extends SpoCommand_1.default {
                     // initiate chunked upload session
                     const uploadId = (0, uuid_1.v4)();
                     const requestOptions = {
-                        url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(folderPath)}')/Files/GetByPathOrAddStub(DecodedUrl='${encodeURIComponent(fileName)}')/StartUpload(uploadId=guid'${uploadId}')`,
+                        url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(folderPath)}')/Files/GetByPathOrAddStub(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(fileName)}')/StartUpload(uploadId=guid'${uploadId}')`,
                         headers: {
                             'accept': 'application/json;odata=nometadata'
                         }
@@ -129,7 +130,7 @@ class SpoFileAddCommand extends SpoCommand_1.default {
                             logger.logToStderr('Cancelling upload session due to error...');
                         }
                         const requestOptions = {
-                            url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(folderPath)}')/Files('${encodeURIComponent(fileName)}')/cancelupload(uploadId=guid'${uploadId}')`,
+                            url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(folderPath)}')/Files('${formatting_1.formatting.encodeQueryParameter(fileName)}')/cancelupload(uploadId=guid'${uploadId}')`,
                             headers: {
                                 'accept': 'application/json;odata=nometadata'
                             }
@@ -151,7 +152,7 @@ class SpoFileAddCommand extends SpoCommand_1.default {
                     const fileBody = fs.readFileSync(fullPath);
                     const bodyLength = fileBody.byteLength;
                     const requestOptions = {
-                        url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(folderPath)}')/Files/Add(url='${encodeURIComponent(fileName)}', overwrite=true)`,
+                        url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(folderPath)}')/Files/Add(url='${formatting_1.formatting.encodeQueryParameter(fileName)}', overwrite=true)`,
                         data: fileBody,
                         headers: {
                             'accept': 'application/json;odata=nometadata',
@@ -193,7 +194,7 @@ class SpoFileAddCommand extends SpoCommand_1.default {
                     }
                     // approve the existing file with given comment
                     const requestOptions = {
-                        url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(folderPath)}')/Files('${encodeURIComponent(fileName)}')/approve(comment='${encodeURIComponent(args.options.approveComment || '')}')`,
+                        url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(folderPath)}')/Files('${formatting_1.formatting.encodeQueryParameter(fileName)}')/approve(comment='${formatting_1.formatting.encodeQueryParameter(args.options.approveComment || '')}')`,
                         headers: {
                             'accept': 'application/json;odata=nometadata'
                         },
@@ -210,7 +211,7 @@ class SpoFileAddCommand extends SpoCommand_1.default {
                     }
                     // publish the existing file with given comment
                     const requestOptions = {
-                        url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(folderPath)}')/Files('${encodeURIComponent(fileName)}')/publish(comment='${encodeURIComponent(args.options.publishComment || '')}')`,
+                        url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(folderPath)}')/Files('${formatting_1.formatting.encodeQueryParameter(fileName)}')/publish(comment='${formatting_1.formatting.encodeQueryParameter(args.options.publishComment || '')}')`,
                         headers: {
                             'accept': 'application/json;odata=nometadata'
                         },
@@ -224,7 +225,7 @@ class SpoFileAddCommand extends SpoCommand_1.default {
                     // in a case the command has done checkout
                     // then have to rollback the checkout
                     const requestOptions = {
-                        url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(folderPath)}')/Files('${encodeURIComponent(fileName)}')/UndoCheckOut()`
+                        url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(folderPath)}')/Files('${formatting_1.formatting.encodeQueryParameter(fileName)}')/UndoCheckOut()`
                     };
                     try {
                         yield request_1.default.post(requestOptions);
@@ -265,7 +266,7 @@ class SpoFileAddCommand extends SpoCommand_1.default {
     fileCheckOut(fileName, webUrl, folder) {
         // check if file already exists, otherwise it can't be checked out
         const requestOptions = {
-            url: `${webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(folder)}')/Files('${encodeURIComponent(fileName)}')`,
+            url: `${webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(folder)}')/Files('${formatting_1.formatting.encodeQueryParameter(fileName)}')`,
             headers: {
                 'accept': 'application/json;odata=nometadata'
             }
@@ -274,7 +275,7 @@ class SpoFileAddCommand extends SpoCommand_1.default {
             .then(() => {
             // checkout the existing file
             const requestOptions = {
-                url: `${webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(folder)}')/Files('${encodeURIComponent(fileName)}')/CheckOut()`,
+                url: `${webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(folder)}')/Files('${formatting_1.formatting.encodeQueryParameter(fileName)}')/CheckOut()`,
                 headers: {
                     'accept': 'application/json;odata=nometadata'
                 },
@@ -299,7 +300,7 @@ class SpoFileAddCommand extends SpoCommand_1.default {
                 fileBuffer = fileBuffer.slice(0, readCount);
             }
             const requestOptions = {
-                url: `${info.WebUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(info.FolderPath)}')/Files('${encodeURIComponent(info.Name)}')/${isLastChunk ? 'Finish' : 'Continue'}Upload(uploadId=guid'${info.Id}',fileOffset=${offset})`,
+                url: `${info.WebUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(info.FolderPath)}')/Files('${formatting_1.formatting.encodeQueryParameter(info.Name)}')/${isLastChunk ? 'Finish' : 'Continue'}Upload(uploadId=guid'${info.Id}',fileOffset=${offset})`,
                 data: fileBuffer,
                 headers: {
                     'accept': 'application/json;odata=nometadata',
@@ -357,7 +358,7 @@ class SpoFileAddCommand extends SpoCommand_1.default {
             logger.logToStderr(`Getting list details in order to get its available content types afterwards...`);
         }
         const requestOptions = {
-            url: `${webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(folder)}')/Files('${encodeURIComponent(fileName)}')/ListItemAllFields/ParentList?$Select=Id,EnableModeration,EnableVersioning,EnableMinorVersions`,
+            url: `${webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(folder)}')/Files('${formatting_1.formatting.encodeQueryParameter(fileName)}')/ListItemAllFields/ParentList?$Select=Id,EnableModeration,EnableVersioning,EnableMinorVersions`,
             headers: {
                 'accept': 'application/json;odata=nometadata'
             },
@@ -380,7 +381,7 @@ class SpoFileAddCommand extends SpoCommand_1.default {
         }
         // update the existing file list item fields
         const requestOptions = {
-            url: `${webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(folderPath)}')/Files('${encodeURIComponent(fileName)}')/ListItemAllFields/ValidateUpdateListItem()`,
+            url: `${webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(folderPath)}')/Files('${formatting_1.formatting.encodeQueryParameter(fileName)}')/ListItemAllFields/ValidateUpdateListItem()`,
             headers: {
                 'accept': 'application/json;odata=nometadata'
             },
@@ -404,7 +405,7 @@ class SpoFileAddCommand extends SpoCommand_1.default {
     }
     fileCheckIn(args, fileName) {
         const requestOptions = {
-            url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(args.options.folder)}')/Files('${encodeURIComponent(fileName)}')/CheckIn(comment='${encodeURIComponent(args.options.checkInComment || '')}',checkintype=0)`,
+            url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(args.options.folder)}')/Files('${formatting_1.formatting.encodeQueryParameter(fileName)}')/CheckIn(comment='${formatting_1.formatting.encodeQueryParameter(args.options.checkInComment || '')}',checkintype=0)`,
             headers: {
                 'accept': 'application/json;odata=nometadata'
             },

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

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoFileCheckinCommand_instances, _SpoFileCheckinCommand_initTelemetry, _SpoFileCheckinCommand_initOptions, _SpoFileCheckinCommand_initValidators, _SpoFileCheckinCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -54,14 +55,14 @@ class SpoFileCheckinCommand extends SpoCommand_1.default {
             }
             let comment = '';
             if (args.options.comment) {
-                comment = encodeURIComponent(args.options.comment);
+                comment = formatting_1.formatting.encodeQueryParameter(args.options.comment);
             }
             let requestUrl = '';
             if (args.options.id) {
-                requestUrl = `${args.options.webUrl}/_api/web/GetFileById('${encodeURIComponent(args.options.id)}')/checkin(comment='${comment}',checkintype=${type})`;
+                requestUrl = `${args.options.webUrl}/_api/web/GetFileById('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')/checkin(comment='${comment}',checkintype=${type})`;
             }
-            if (args.options.fileUrl) {
-                requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${encodeURIComponent(args.options.fileUrl)}')/checkin(comment='${comment}',checkintype=${type})`;
+            if (args.options.url) {
+                requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(args.options.url)}')/checkin(comment='${comment}',checkintype=${type})`;
             }
             const requestOptions = {
                 url: requestUrl,
@@ -83,7 +84,7 @@ _SpoFileCheckinCommand_instances = new WeakSet(), _SpoFileCheckinCommand_initTel
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             id: (!(!args.options.id)).toString(),
-            url: (!(!args.options.fileUrl)).toString(),
+            url: (!(!args.options.url)).toString(),
             type: args.options.type || 'Major',
             comment: typeof args.options.comment !== 'undefined'
         });
@@ -92,7 +93,7 @@ _SpoFileCheckinCommand_instances = new WeakSet(), _SpoFileCheckinCommand_initTel
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-f, --fileUrl [fileUrl]'
+        option: '-f, --url [url]'
     }, {
         option: '-i, --id [id]'
     }, {
@@ -125,7 +126,7 @@ _SpoFileCheckinCommand_instances = new WeakSet(), _SpoFileCheckinCommand_initTel
         return true;
     }));
 }, _SpoFileCheckinCommand_initOptionSets = function _SpoFileCheckinCommand_initOptionSets() {
-    this.optionSets.push(['fileUrl', 'id']);
+    this.optionSets.push({ options: ['url', 'id'] });
 };
 module.exports = new SpoFileCheckinCommand();
 //# sourceMappingURL=file-checkin.js.map

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

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoFileCheckoutCommand_instances, _SpoFileCheckoutCommand_initTelemetry, _SpoFileCheckoutCommand_initOptions, _SpoFileCheckoutCommand_initValidators, _SpoFileCheckoutCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -38,10 +39,10 @@ class SpoFileCheckoutCommand extends SpoCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             let requestUrl = '';
             if (args.options.id) {
-                requestUrl = `${args.options.webUrl}/_api/web/GetFileById('${encodeURIComponent(args.options.id)}')/checkout`;
+                requestUrl = `${args.options.webUrl}/_api/web/GetFileById('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')/checkout`;
             }
-            if (args.options.fileUrl) {
-                requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${encodeURIComponent(args.options.fileUrl)}')/checkout`;
+            if (args.options.url) {
+                requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(args.options.url)}')/checkout`;
             }
             const requestOptions = {
                 url: requestUrl,
@@ -63,14 +64,14 @@ _SpoFileCheckoutCommand_instances = new WeakSet(), _SpoFileCheckoutCommand_initT
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             id: (!(!args.options.id)).toString(),
-            fileUrl: (!(!args.options.fileUrl)).toString()
+            url: (!(!args.options.url)).toString()
         });
     });
 }, _SpoFileCheckoutCommand_initOptions = function _SpoFileCheckoutCommand_initOptions() {
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-f, --fileUrl [fileUrl]'
+        option: '-f, --url [url]'
     }, {
         option: '-i, --id [id]'
     });
@@ -88,7 +89,7 @@ _SpoFileCheckoutCommand_instances = new WeakSet(), _SpoFileCheckoutCommand_initT
         return true;
     }));
 }, _SpoFileCheckoutCommand_initOptionSets = function _SpoFileCheckoutCommand_initOptionSets() {
-    this.optionSets.push(['id', 'fileUrl']);
+    this.optionSets.push({ options: ['id', 'url'] });
 };
 module.exports = new SpoFileCheckoutCommand();
 //# sourceMappingURL=file-checkout.js.map

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

@@ -23,6 +23,7 @@ const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
+const formatting_1 = require("../../../../utils/formatting");
 const removeCommand = require('./file-remove');
 class SpoFileCopyCommand extends SpoCommand_1.default {
     constructor() {
@@ -110,7 +111,7 @@ class SpoFileCopyCommand extends SpoCommand_1.default {
     fileExists(tenantUrl, webUrl, sourceUrl) {
         const webServerRelativeUrl = webUrl.replace(tenantUrl, '');
         const fileServerRelativeUrl = `${webServerRelativeUrl}${sourceUrl}`;
-        const requestUrl = `${webUrl}/_api/web/GetFileByServerRelativeUrl('${encodeURIComponent(fileServerRelativeUrl)}')/`;
+        const requestUrl = `${webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(fileServerRelativeUrl)}')/`;
         const requestOptions = {
             url: requestUrl,
             method: 'GET',