@pnp/cli-microsoft365 5.3.0 → 5.4.0-beta.1051e37

package/dist/m365/spo/commands/list/list-view-add.js

@@ -17,6 +17,7 @@ class SpoListViewAddCommand extends SpoCommand_1.default {
         telemetryProps.listTitle = typeof args.options.listTitle !== 'undefined';
         telemetryProps.listUrl = typeof args.options.listUrl !== 'undefined';
         telemetryProps.title = typeof args.options.title !== 'undefined';
+        telemetryProps.viewQuery = typeof args.options.viewQuery !== 'undefined';
         telemetryProps.personal = !!args.options.personal;
         telemetryProps.default = !!args.options.default;
         telemetryProps.orderedView = !!args.options.orderedView;
@@ -38,6 +39,7 @@ class SpoListViewAddCommand extends SpoCommand_1.default {
                     ViewFields: {
                         results: args.options.fields.split(',')
                     },
+                    Query: args.options.viewQuery,
                     PersonalView: !!args.options.personal,
                     SetAsDefaultView: !!args.options.default,
                     Paged: !!args.options.paged,
@@ -55,13 +57,13 @@ class SpoListViewAddCommand extends SpoCommand_1.default {
     getRestUrl(options) {
         let result = `${options.webUrl}/_api/web/`;
         if (options.listId) {
-            result += `lists(guid'${encodeURIComponent(options.listId)}')`;
+            result += `lists(guid'${utils_1.formatting.encodeQueryParameter(options.listId)}')`;
         }
         else if (options.listTitle) {
-            result += `lists/getByTitle('${encodeURIComponent(options.listTitle)}')`;
+            result += `lists/getByTitle('${utils_1.formatting.encodeQueryParameter(options.listTitle)}')`;
         }
         else if (options.listUrl) {
-            result += `GetList('${encodeURIComponent(utils_1.urlUtil.getServerRelativePath(options.webUrl, options.listUrl))}')`;
+            result += `GetList('${utils_1.formatting.encodeQueryParameter(utils_1.urlUtil.getServerRelativePath(options.webUrl, options.listUrl))}')`;
         }
         result += '/views/add';
         return result;
@@ -79,6 +81,7 @@ class SpoListViewAddCommand extends SpoCommand_1.default {
             { option: '--listUrl [listUrl]' },
             { option: '--title <title>' },
             { option: '--fields <fields>' },
+            { option: '--viewQuery [viewQuery]' },
             { option: '--personal' },
             { option: '--default' },
             { option: '--paged' },

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

@@ -23,7 +23,7 @@ class SpoListViewFieldAddCommand extends SpoCommand_1.default {
         return telemetryProps;
     }
     commandAction(logger, args, cb) {
-        const listSelector = args.options.listId ? `(guid'${encodeURIComponent(args.options.listId)}')` : `/GetByTitle('${encodeURIComponent(args.options.listTitle)}')`;
+        const listSelector = args.options.listId ? `(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')` : `/GetByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
         let viewSelector = '';
         let currentField;
         if (this.verbose) {
@@ -36,7 +36,7 @@ class SpoListViewFieldAddCommand extends SpoCommand_1.default {
                 logger.logToStderr(`Adding the field ${args.options.fieldId || args.options.fieldTitle} to the view ${args.options.viewId || args.options.viewTitle}...`);
             }
             currentField = field;
-            viewSelector = args.options.viewId ? `('${encodeURIComponent(args.options.viewId)}')` : `/GetByTitle('${encodeURIComponent(args.options.viewTitle)}')`;
+            viewSelector = args.options.viewId ? `('${utils_1.formatting.encodeQueryParameter(args.options.viewId)}')` : `/GetByTitle('${utils_1.formatting.encodeQueryParameter(args.options.viewTitle)}')`;
             const postRequestUrl = `${args.options.webUrl}/_api/web/lists${listSelector}/views${viewSelector}/viewfields/addviewfield('${field.InternalName}')`;
             const postRequestOptions = {
                 url: postRequestUrl,

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

@@ -24,7 +24,7 @@ class SpoListViewFieldRemoveCommand extends SpoCommand_1.default {
         return telemetryProps;
     }
     commandAction(logger, args, cb) {
-        const listSelector = args.options.listId ? `(guid'${encodeURIComponent(args.options.listId)}')` : `/GetByTitle('${encodeURIComponent(args.options.listTitle)}')`;
+        const listSelector = args.options.listId ? `(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')` : `/GetByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
         const removeFieldFromView = () => {
             if (this.verbose) {
                 logger.logToStderr(`Getting field ${args.options.fieldId || args.options.fieldTitle}...`);
@@ -35,7 +35,7 @@ class SpoListViewFieldRemoveCommand extends SpoCommand_1.default {
                 if (this.verbose) {
                     logger.logToStderr(`Removing field ${args.options.fieldId || args.options.fieldTitle} from view ${args.options.viewId || args.options.viewTitle}...`);
                 }
-                const viewSelector = args.options.viewId ? `('${encodeURIComponent(args.options.viewId)}')` : `/GetByTitle('${encodeURIComponent(args.options.viewTitle)}')`;
+                const viewSelector = args.options.viewId ? `('${utils_1.formatting.encodeQueryParameter(args.options.viewId)}')` : `/GetByTitle('${utils_1.formatting.encodeQueryParameter(args.options.viewTitle)}')`;
                 const postRequestUrl = `${args.options.webUrl}/_api/web/lists${listSelector}/views${viewSelector}/viewfields/removeviewfield('${field.InternalName}')`;
                 const postRequestOptions = {
                     url: postRequestUrl,

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

@@ -22,8 +22,8 @@ class SpoListViewFieldSetCommand extends SpoCommand_1.default {
         return telemetryProps;
     }
     commandAction(logger, args, cb) {
-        const listSelector = args.options.listId ? `(guid'${encodeURIComponent(args.options.listId)}')` : `/GetByTitle('${encodeURIComponent(args.options.listTitle)}')`;
-        const viewSelector = args.options.viewId ? `('${encodeURIComponent(args.options.viewId)}')` : `/GetByTitle('${encodeURIComponent(args.options.viewTitle)}')`;
+        const listSelector = args.options.listId ? `(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')` : `/GetByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
+        const viewSelector = args.options.viewId ? `('${utils_1.formatting.encodeQueryParameter(args.options.viewId)}')` : `/GetByTitle('${utils_1.formatting.encodeQueryParameter(args.options.viewTitle)}')`;
         if (this.verbose) {
             logger.logToStderr(`Getting field ${args.options.fieldId || args.options.fieldTitle}...`);
         }

package/dist/m365/spo/commands/list/list-view-get.js

@@ -24,16 +24,16 @@ class SpoListViewGetCommand extends SpoCommand_1.default {
         const baseRestUrl = `${args.options.webUrl}/_api/web`;
         let listRestUrl = '';
         if (args.options.listId) {
-            listRestUrl = `/lists(guid'${encodeURIComponent(args.options.listId)}')`;
+            listRestUrl = `/lists(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')`;
         }
         else if (args.options.listTitle) {
-            listRestUrl = `/lists/getByTitle('${encodeURIComponent(args.options.listTitle)}')`;
+            listRestUrl = `/lists/getByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
         }
         else if (args.options.listUrl) {
             const listServerRelativeUrl = utils_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
-            listRestUrl = `/GetList('${encodeURIComponent(listServerRelativeUrl)}')`;
+            listRestUrl = `/GetList('${utils_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
         }
-        const viewRestUrl = `/views/${(args.options.viewId ? `getById('${encodeURIComponent(args.options.viewId)}')` : `getByTitle('${encodeURIComponent(args.options.viewTitle)}')`)}`;
+        const viewRestUrl = `/views/${(args.options.viewId ? `getById('${utils_1.formatting.encodeQueryParameter(args.options.viewId)}')` : `getByTitle('${utils_1.formatting.encodeQueryParameter(args.options.viewTitle)}')`)}`;
         const requestOptions = {
             url: `${baseRestUrl}${listRestUrl}${viewRestUrl}`,
             headers: {

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

@@ -22,15 +22,15 @@ class SpoListViewListCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args, cb) {
         if (this.verbose) {
-            const list = args.options.listId ? encodeURIComponent(args.options.listId) : encodeURIComponent(args.options.listTitle);
+            const list = (args.options.listId ? args.options.listId : args.options.listTitle);
             logger.logToStderr(`Retrieving views information for list ${list} in site at ${args.options.webUrl}...`);
         }
         let requestUrl = '';
         if (args.options.listId) {
-            requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${encodeURIComponent(args.options.listId)}')/views`;
+            requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')/views`;
         }
         else {
-            requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${encodeURIComponent(args.options.listTitle)}')/views`;
+            requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')/views`;
         }
         const requestOptions = {
             url: requestUrl,

package/dist/m365/spo/commands/list/list-view-remove.js

@@ -24,12 +24,12 @@ class SpoListViewRemoveCommand extends SpoCommand_1.default {
     commandAction(logger, args, cb) {
         const removeViewFromList = () => {
             if (this.verbose) {
-                const list = args.options.listId ? encodeURIComponent(args.options.listId) : encodeURIComponent(args.options.listTitle);
+                const list = (args.options.listId ? args.options.listId : args.options.listTitle);
                 logger.logToStderr(`Removing view ${args.options.viewId || args.options.viewTitle} from list ${list} in site at ${args.options.webUrl}...`);
             }
             let requestUrl = '';
-            const listSelector = args.options.listId ? `(guid'${encodeURIComponent(args.options.listId)}')` : `/GetByTitle('${encodeURIComponent(args.options.listTitle)}')`;
-            const viewSelector = args.options.viewId ? `(guid'${encodeURIComponent(args.options.viewId)}')` : `/GetByTitle('${encodeURIComponent(args.options.viewTitle)}')`;
+            const listSelector = args.options.listId ? `(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')` : `/GetByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
+            const viewSelector = args.options.viewId ? `(guid'${utils_1.formatting.encodeQueryParameter(args.options.viewId)}')` : `/GetByTitle('${utils_1.formatting.encodeQueryParameter(args.options.viewTitle)}')`;
             requestUrl = `${args.options.webUrl}/_api/web/lists${listSelector}/views${viewSelector}`;
             const requestOptions = {
                 url: requestUrl,

package/dist/m365/spo/commands/list/list-view-set.js

@@ -25,9 +25,9 @@ class SpoListViewSetCommand extends SpoCommand_1.default {
     commandAction(logger, args, cb) {
         const baseRestUrl = `${args.options.webUrl}/_api/web/lists`;
         const listRestUrl = args.options.listId ?
-            `(guid'${encodeURIComponent(args.options.listId)}')`
-            : `/getByTitle('${encodeURIComponent(args.options.listTitle)}')`;
-        const viewRestUrl = `/views/${(args.options.viewId ? `getById('${encodeURIComponent(args.options.viewId)}')` : `getByTitle('${encodeURIComponent(args.options.viewTitle)}')`)}`;
+            `(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')`
+            : `/getByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
+        const viewRestUrl = `/views/${(args.options.viewId ? `getById('${utils_1.formatting.encodeQueryParameter(args.options.viewId)}')` : `getByTitle('${utils_1.formatting.encodeQueryParameter(args.options.viewTitle)}')`)}`;
         utils_1.spo
             .getRequestDigest(args.options.webUrl)
             .then((res) => {

package/dist/m365/spo/commands/list/list-webhook-add.js

@@ -25,14 +25,14 @@ class SpoListWebhookAddCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args, cb) {
         if (this.verbose) {
-            logger.logToStderr(`Adding webhook to list ${args.options.listId ? encodeURIComponent(args.options.listId) : encodeURIComponent(args.options.listTitle)} located at site ${args.options.webUrl}...`);
+            logger.logToStderr(`Adding webhook to list ${args.options.listId ? args.options.listId : args.options.listTitle} located at site ${args.options.webUrl}...`);
         }
         let requestUrl = '';
         if (args.options.listId) {
-            requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${encodeURIComponent(args.options.listId)}')/Subscriptions')`;
+            requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')/Subscriptions')`;
         }
         else {
-            requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${encodeURIComponent(args.options.listTitle)}')/Subscriptions')`;
+            requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')/Subscriptions')`;
         }
         const requestBody = {};
         requestBody.resource = args.options.listId ? args.options.listId : args.options.listTitle;

package/dist/m365/spo/commands/list/list-webhook-get.js

@@ -20,15 +20,15 @@ class SpoListWebhookGetCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args, cb) {
         if (this.verbose) {
-            const list = args.options.listId ? encodeURIComponent(args.options.listId) : encodeURIComponent(args.options.listTitle);
+            const list = (args.options.listId ? args.options.listId : args.options.listTitle);
             logger.logToStderr(`Retrieving information for webhook ${args.options.id} belonging to list ${list} in site at ${args.options.webUrl}...`);
         }
         let requestUrl = '';
         if (args.options.listId) {
-            requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${encodeURIComponent(args.options.listId)}')/Subscriptions('${encodeURIComponent(args.options.id)}')`;
+            requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')/Subscriptions('${utils_1.formatting.encodeQueryParameter(args.options.id)}')`;
         }
         else {
-            requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${encodeURIComponent(args.options.listTitle)}')/Subscriptions('${encodeURIComponent(args.options.id)}')`;
+            requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')/Subscriptions('${utils_1.formatting.encodeQueryParameter(args.options.id)}')`;
         }
         const requestOptions = {
             url: requestUrl,

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

@@ -31,21 +31,21 @@ class SpoListWebhookListCommand extends SpoCommand_1.default {
             logger.logToStderr(chalk.yellow(`Option 'id' is deprecated. Please use 'listId' instead`));
         }
         if (this.verbose) {
-            const list = args.options.id ? encodeURIComponent(args.options.id) : (args.options.listId ? encodeURIComponent(args.options.listId) : (args.options.title ? encodeURIComponent(args.options.title) : encodeURIComponent(args.options.listTitle)));
+            const list = args.options.id ? utils_1.formatting.encodeQueryParameter(args.options.id) : (args.options.listId ? utils_1.formatting.encodeQueryParameter(args.options.listId) : (args.options.title ? utils_1.formatting.encodeQueryParameter(args.options.title) : utils_1.formatting.encodeQueryParameter(args.options.listTitle)));
             logger.logToStderr(`Retrieving webhook information for list ${list} in site at ${args.options.webUrl}...`);
         }
         let requestUrl = '';
         if (args.options.id) {
-            requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${encodeURIComponent(args.options.id)}')/Subscriptions`;
+            requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${utils_1.formatting.encodeQueryParameter(args.options.id)}')/Subscriptions`;
         }
         else if (args.options.listId) {
-            requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${encodeURIComponent(args.options.listId)}')/Subscriptions`;
+            requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')/Subscriptions`;
         }
         else if (args.options.listTitle) {
-            requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${encodeURIComponent(args.options.listTitle)}')/Subscriptions`;
+            requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')/Subscriptions`;
         }
         else {
-            requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${encodeURIComponent(args.options.title)}')/Subscriptions`;
+            requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${utils_1.formatting.encodeQueryParameter(args.options.title)}')/Subscriptions`;
         }
         const requestOptions = {
             url: requestUrl,

package/dist/m365/spo/commands/list/list-webhook-remove.js

@@ -21,17 +21,17 @@ class SpoListWebhookRemoveCommand extends SpoCommand_1.default {
         return telemetryProps;
     }
     commandAction(logger, args, cb) {
-        const list = args.options.listId ? encodeURIComponent(args.options.listId) : encodeURIComponent(args.options.listTitle);
         const removeWebhook = () => {
             if (this.verbose) {
+                const list = (args.options.listId ? args.options.listId : args.options.listTitle);
                 logger.logToStderr(`Webhook ${args.options.id} is about to be removed from list ${list} located at site ${args.options.webUrl}...`);
             }
             let requestUrl = '';
             if (args.options.listId) {
-                requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${encodeURIComponent(args.options.listId)}')/Subscriptions('${encodeURIComponent(args.options.id)}')`;
+                requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')/Subscriptions('${utils_1.formatting.encodeQueryParameter(args.options.id)}')`;
             }
             else {
-                requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${encodeURIComponent(args.options.listTitle)}')/Subscriptions('${encodeURIComponent(args.options.id)}')`;
+                requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')/Subscriptions('${utils_1.formatting.encodeQueryParameter(args.options.id)}')`;
             }
             const requestOptions = {
                 url: requestUrl,
@@ -58,7 +58,7 @@ class SpoListWebhookRemoveCommand extends SpoCommand_1.default {
                 type: 'confirm',
                 name: 'continue',
                 default: false,
-                message: `Are you sure you want to remove webhook ${args.options.id} from list ${list} located at site ${args.options.webUrl}?`
+                message: `Are you sure you want to remove webhook ${args.options.id} from list ${args.options.listTitle || args.options.listId} located at site ${args.options.webUrl}?`
             }, (result) => {
                 if (!result.continue) {
                     cb();

package/dist/m365/spo/commands/list/list-webhook-set.js

@@ -22,14 +22,14 @@ class SpoListWebhookSetCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args, cb) {
         if (this.verbose) {
-            logger.logToStderr(`Updating webhook ${args.options.id} belonging to list ${args.options.listId ? encodeURIComponent(args.options.listId) : encodeURIComponent(args.options.listTitle)} located at site ${args.options.webUrl}...`);
+            logger.logToStderr(`Updating webhook ${args.options.id} belonging to list ${args.options.listId ? args.options.listId : args.options.listTitle} located at site ${args.options.webUrl}...`);
         }
         let requestUrl = '';
         if (args.options.listId) {
-            requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${encodeURIComponent(args.options.listId)}')/Subscriptions('${encodeURIComponent(args.options.id)}')`;
+            requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')/Subscriptions('${utils_1.formatting.encodeQueryParameter(args.options.id)}')`;
         }
         else {
-            requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${encodeURIComponent(args.options.listTitle)}')/Subscriptions('${encodeURIComponent(args.options.id)}')`;
+            requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')/Subscriptions('${utils_1.formatting.encodeQueryParameter(args.options.id)}')`;
         }
         const requestBody = {};
         if (args.options.notificationUrl) {

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

@@ -26,8 +26,8 @@ class SpoListItemAddCommand extends SpoCommand_1.default {
         const listIdArgument = args.options.listId || '';
         const listTitleArgument = args.options.listTitle || '';
         const listRestUrl = (args.options.listId ?
-            `${args.options.webUrl}/_api/web/lists(guid'${encodeURIComponent(listIdArgument)}')`
-            : `${args.options.webUrl}/_api/web/lists/getByTitle('${encodeURIComponent(listTitleArgument)}')`);
+            `${args.options.webUrl}/_api/web/lists(guid'${utils_1.formatting.encodeQueryParameter(listIdArgument)}')`
+            : `${args.options.webUrl}/_api/web/lists/getByTitle('${utils_1.formatting.encodeQueryParameter(listTitleArgument)}')`);
         let contentTypeName = '';
         let targetFolderServerRelativeUrl = '';
         if (this.verbose) {

package/dist/m365/spo/commands/listitem/listitem-attachment-list.js

@@ -24,8 +24,8 @@ class SpoListItemAttachmentListCommand extends SpoCommand_1.default {
         const listIdArgument = args.options.listId || '';
         const listTitleArgument = args.options.listTitle || '';
         const listRestUrl = (args.options.listId ?
-            `${args.options.webUrl}/_api/web/lists(guid'${encodeURIComponent(listIdArgument)}')`
-            : `${args.options.webUrl}/_api/web/lists/getByTitle('${encodeURIComponent(listTitleArgument)}')`);
+            `${args.options.webUrl}/_api/web/lists(guid'${utils_1.formatting.encodeQueryParameter(listIdArgument)}')`
+            : `${args.options.webUrl}/_api/web/lists/getByTitle('${utils_1.formatting.encodeQueryParameter(listTitleArgument)}')`);
         const requestOptions = {
             url: `${listRestUrl}/items(${args.options.itemId})?$select=AttachmentFiles&$expand=AttachmentFiles`,
             method: 'GET',

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

@@ -24,8 +24,8 @@ class SpoListItemGetCommand extends SpoCommand_1.default {
         const listIdArgument = args.options.listId || '';
         const listTitleArgument = args.options.listTitle || '';
         const listRestUrl = (args.options.listId ?
-            `${args.options.webUrl}/_api/web/lists(guid'${encodeURIComponent(listIdArgument)}')`
-            : `${args.options.webUrl}/_api/web/lists/getByTitle('${encodeURIComponent(listTitleArgument)}')`);
+            `${args.options.webUrl}/_api/web/lists(guid'${utils_1.formatting.encodeQueryParameter(listIdArgument)}')`
+            : `${args.options.webUrl}/_api/web/lists/getByTitle('${utils_1.formatting.encodeQueryParameter(listTitleArgument)}')`);
         const propertiesSelect = args.options.properties ?
             `?$select=${encodeURIComponent(args.options.properties)}` :
             ((!args.options.output || args.options.output === 'text') ?

package/dist/m365/spo/commands/listitem/listitem-isrecord.js

@@ -25,8 +25,8 @@ class SpoListItemIsRecordCommand extends SpoCommand_1.default {
         const listIdArgument = args.options.listId || '';
         const listTitleArgument = args.options.listTitle || '';
         const listRestUrl = (args.options.listId ?
-            `${args.options.webUrl}/_api/web/lists(guid'${encodeURIComponent(listIdArgument)}')`
-            : `${args.options.webUrl}/_api/web/lists/getByTitle('${encodeURIComponent(listTitleArgument)}')`);
+            `${args.options.webUrl}/_api/web/lists(guid'${utils_1.formatting.encodeQueryParameter(listIdArgument)}')`
+            : `${args.options.webUrl}/_api/web/lists/getByTitle('${utils_1.formatting.encodeQueryParameter(listTitleArgument)}')`);
         let formDigestValue = '';
         let listId = '';
         if (this.debug) {

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

@@ -14,6 +14,8 @@ class SpoListItemListCommand extends SpoCommand_1.default {
     getTelemetryProperties(args) {
         const telemetryProps = super.getTelemetryProperties(args);
         telemetryProps.id = typeof args.options.id !== 'undefined';
+        telemetryProps.listId = typeof args.options.listId !== 'undefined';
+        telemetryProps.listTitle = typeof args.options.listTitle !== 'undefined';
         telemetryProps.title = typeof args.options.title !== 'undefined';
         telemetryProps.fields = typeof args.options.fields !== 'undefined';
         telemetryProps.filter = typeof args.options.filter !== 'undefined';
@@ -23,14 +25,20 @@ class SpoListItemListCommand extends SpoCommand_1.default {
         return telemetryProps;
     }
     commandAction(logger, args, cb) {
-        const listIdArgument = args.options.id || '';
-        const listTitleArgument = args.options.title || '';
+        if (args.options.id) {
+            this.warn(logger, `Option 'id' is deprecated. Please use 'listId' instead.`);
+        }
+        if (args.options.title) {
+            this.warn(logger, `Option 'title' is deprecated. Please use 'listTitle' instead.`);
+        }
+        const listIdArgument = args.options.listId || args.options.id || '';
+        const listTitleArgument = args.options.listTitle || args.options.title || '';
         let formDigestValue = '';
         const fieldsArray = args.options.fields ? args.options.fields.split(",")
             : (!args.options.output || args.options.output === "text") ? ["Title", "Id"] : [];
-        const listRestUrl = (args.options.id ?
-            `${args.options.webUrl}/_api/web/lists(guid'${encodeURIComponent(listIdArgument)}')`
-            : `${args.options.webUrl}/_api/web/lists/getByTitle('${encodeURIComponent(listTitleArgument)}')`);
+        const listRestUrl = listIdArgument ?
+            `${args.options.webUrl}/_api/web/lists(guid'${utils_1.formatting.encodeQueryParameter(listIdArgument)}')`
+            : `${args.options.webUrl}/_api/web/lists/getByTitle('${utils_1.formatting.encodeQueryParameter(listTitleArgument)}')`;
         (() => {
             if (args.options.camlQuery) {
                 if (this.debug) {
@@ -100,10 +108,16 @@ class SpoListItemListCommand extends SpoCommand_1.default {
                 option: '-u, --webUrl <webUrl>'
             },
             {
-                option: '-i, --id [listId]'
+                option: '--id [id]'
+            },
+            {
+                option: '--title [title]'
             },
             {
-                option: '-t, --title [listTitle]'
+                option: '-i, --listId [listId]'
+            },
+            {
+                option: '-t, --listTitle [listTitle]'
             },
             {
                 option: '-s, --pageSize [pageSize]'
@@ -143,12 +157,16 @@ class SpoListItemListCommand extends SpoCommand_1.default {
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        if (!args.options.id && !args.options.title) {
-            return `Specify list id or title`;
+        if (!args.options.id && !args.options.title && !args.options.listId && !args.options.listTitle) {
+            return `Specify listId or listTitle`;
         }
         if (args.options.id && args.options.title) {
             return `Specify list id or title but not both`;
         }
+        // Check if only one of the 4 options is specified
+        if ([args.options.id, args.options.title, args.options.listId, args.options.listTitle].filter(o => o).length > 1) {
+            return 'Specify listId or listTitle but not both';
+        }
         if (args.options.camlQuery && args.options.fields) {
             return `Specify camlQuery or fields but not both`;
         }
@@ -167,8 +185,10 @@ class SpoListItemListCommand extends SpoCommand_1.default {
         if (args.options.pageNumber && isNaN(Number(args.options.pageNumber))) {
             return `pageNumber must be numeric`;
         }
-        if (args.options.id &&
-            !utils_1.validation.isValidGuid(args.options.id)) {
+        if (args.options.listId && !utils_1.validation.isValidGuid(args.options.listId)) {
+            return `${args.options.listId} is not a valid GUID`;
+        }
+        if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} in option id is not a valid GUID`;
         }
         return true;

package/dist/m365/spo/commands/listitem/listitem-record-declare.js

@@ -25,8 +25,8 @@ class SpoListItemRecordDeclareCommand extends SpoCommand_1.default {
         let webIdentity = '';
         let listId = '';
         const listRestUrl = args.options.listId
-            ? `${args.options.webUrl}/_api/web/lists(guid'${encodeURIComponent(args.options.listId)}')`
-            : `${args.options.webUrl}/_api/web/lists/getByTitle('${encodeURIComponent(args.options.listTitle)}')`;
+            ? `${args.options.webUrl}/_api/web/lists(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')`
+            : `${args.options.webUrl}/_api/web/lists/getByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
         utils_1.spo
             .getRequestDigest(args.options.webUrl)
             .then((contextResponse) => {

package/dist/m365/spo/commands/listitem/listitem-record-undeclare.js

@@ -22,8 +22,8 @@ class SpoListItemRecordUndeclareCommand extends SpoCommand_1.default {
         const listIdArgument = args.options.listId || '';
         const listTitleArgument = args.options.listTitle || '';
         const listRestUrl = (args.options.listId ?
-            `${args.options.webUrl}/_api/web/lists(guid'${encodeURIComponent(listIdArgument)}')`
-            : `${args.options.webUrl}/_api/web/lists/getByTitle('${encodeURIComponent(listTitleArgument)}')`);
+            `${args.options.webUrl}/_api/web/lists(guid'${utils_1.formatting.encodeQueryParameter(listIdArgument)}')`
+            : `${args.options.webUrl}/_api/web/lists/getByTitle('${utils_1.formatting.encodeQueryParameter(listTitleArgument)}')`);
         let formDigestValue = '';
         let environmentListId = '';
         (() => {

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

@@ -27,10 +27,10 @@ class SpoListItemRemoveCommand extends SpoCommand_1.default {
             }
             let requestUrl = '';
             if (args.options.listId) {
-                requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${encodeURIComponent(args.options.listId)}')`;
+                requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')`;
             }
             else {
-                requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${encodeURIComponent(args.options.listTitle)}')`;
+                requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
             }
             requestUrl += `/items(${args.options.id})`;
             if (args.options.recycle) {

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

@@ -22,10 +22,10 @@ class SpoListItemRoleInheritanceBreakCommand extends SpoCommand_1.default {
         }
         let requestUrl = `${args.options.webUrl}/_api/web/lists`;
         if (args.options.listId) {
-            requestUrl += `(guid'${encodeURIComponent(args.options.listId)}')`;
+            requestUrl += `(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')`;
         }
         else {
-            requestUrl += `/getbytitle('${encodeURIComponent(args.options.listTitle)}')`;
+            requestUrl += `/getbytitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
         }
         let keepExistingPermissions = true;
         if (args.options.clearExistingPermissions) {

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

@@ -20,10 +20,10 @@ class SpoListItemRoleInheritanceResetCommand extends SpoCommand_1.default {
     commandAction(logger, args, cb) {
         let requestUrl = `${args.options.webUrl}/_api/web/lists`;
         if (args.options.listId) {
-            requestUrl += `(guid'${encodeURIComponent(args.options.listId)}')`;
+            requestUrl += `(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')`;
         }
         else {
-            requestUrl += `/getbytitle('${encodeURIComponent(args.options.listTitle)}')`;
+            requestUrl += `/getbytitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
         }
         const requestOptions = {
             url: `${requestUrl}/items(${args.options.listItemId})/resetroleinheritance`,

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

@@ -27,8 +27,8 @@ class SpoListItemSetCommand extends SpoCommand_1.default {
         const listIdArgument = args.options.listId || '';
         const listTitleArgument = args.options.listTitle || '';
         const listRestUrl = (args.options.listId ?
-            `${args.options.webUrl}/_api/web/lists(guid'${encodeURIComponent(listIdArgument)}')`
-            : `${args.options.webUrl}/_api/web/lists/getByTitle('${encodeURIComponent(listTitleArgument)}')`);
+            `${args.options.webUrl}/_api/web/lists(guid'${utils_1.formatting.encodeQueryParameter(listIdArgument)}')`
+            : `${args.options.webUrl}/_api/web/lists/getByTitle('${utils_1.formatting.encodeQueryParameter(listTitleArgument)}')`);
         let contentTypeName = '';
         let formDigestValue = '';
         let environmentListId = '';

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

@@ -0,0 +1,82 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const cli_1 = require("../../../../cli");
+const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+class SpoRoleDefinitionRemoveCommand extends SpoCommand_1.default {
+    get name() {
+        return commands_1.default.ROLEDEFINITION_REMOVE;
+    }
+    get description() {
+        return 'Removes the role definition from the specified site';
+    }
+    getTelemetryProperties(args) {
+        const telemetryProps = super.getTelemetryProperties(args);
+        telemetryProps.confirm = (!(!args.options.confirm)).toString();
+        return telemetryProps;
+    }
+    commandAction(logger, args, cb) {
+        const removeRoleDefinition = () => {
+            if (this.verbose) {
+                logger.logToStderr(`Removing role definition from site ${args.options.webUrl}...`);
+            }
+            const requestOptions = {
+                url: `${args.options.webUrl}/_api/web/roledefinitions(${args.options.id})`,
+                method: 'delete',
+                headers: {
+                    'X-HTTP-Method': 'DELETE',
+                    'If-Match': '*',
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            request_1.default
+                .delete(requestOptions)
+                .then(() => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+        };
+        if (args.options.confirm) {
+            removeRoleDefinition();
+        }
+        else {
+            cli_1.Cli.prompt({
+                type: 'confirm',
+                name: 'continue',
+                default: false,
+                message: `Are you sure you want to remove the role definition with id ${args.options.id} from site ${args.options.webUrl}?`
+            }, (result) => {
+                if (!result.continue) {
+                    cb();
+                }
+                else {
+                    removeRoleDefinition();
+                }
+            });
+        }
+    }
+    options() {
+        const options = [
+            {
+                option: '-u, --webUrl <webUrl>'
+            },
+            {
+                option: '-i, --id <id>'
+            },
+            {
+                option: '--confirm'
+            }
+        ];
+        const parentOptions = super.options();
+        return options.concat(parentOptions);
+    }
+    validate(args) {
+        const id = parseInt(args.options.id);
+        if (isNaN(id)) {
+            return `${args.options.id} is not a valid role definition ID`;
+        }
+        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+    }
+}
+module.exports = new SpoRoleDefinitionRemoveCommand();
+//# sourceMappingURL=roledefinition-remove.js.map