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

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

@@ -53,16 +53,13 @@ class SpoListWebhookSetCommand extends SpoCommand_1.default {
                 const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
                 requestUrl += `/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/Subscriptions('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')`;
             }
-            const requestBody = {};
-            if (args.options.notificationUrl) {
-                requestBody.notificationUrl = args.options.notificationUrl;
-            }
-            if (args.options.expirationDateTime) {
-                requestBody.expirationDateTime = args.options.expirationDateTime;
-            }
+            const requestBody = {
+                notificationUrl: args.options.notificationUrl,
+                expirationDateTime: args.options.expirationDateTime,
+                clientState: args.options.clientState
+            };
             const requestOptions = {
                 url: requestUrl,
-                method: 'PATCH',
                 headers: {
                     'accept': 'application/json;odata=nometadata'
                 },
@@ -71,7 +68,6 @@ class SpoListWebhookSetCommand extends SpoCommand_1.default {
             };
             try {
                 yield request_1.default.patch(requestOptions);
-                // REST patch call doesn't return anything
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);
@@ -86,7 +82,8 @@ _SpoListWebhookSetCommand_instances = new WeakSet(), _SpoListWebhookSetCommand_i
             listTitle: typeof args.options.listTitle !== 'undefined',
             listUrl: typeof args.options.listUrl !== 'undefined',
             notificationUrl: typeof args.options.notificationUrl !== 'undefined',
-            expirationDateTime: typeof args.options.expirationDateTime !== 'undefined'
+            expirationDateTime: typeof args.options.expirationDateTime !== 'undefined',
+            clientState: typeof args.options.clientState !== 'undefined'
         });
     });
 }, _SpoListWebhookSetCommand_initOptions = function _SpoListWebhookSetCommand_initOptions() {
@@ -104,6 +101,8 @@ _SpoListWebhookSetCommand_instances = new WeakSet(), _SpoListWebhookSetCommand_i
         option: '-n, --notificationUrl [notificationUrl]'
     }, {
         option: '-e, --expirationDateTime [expirationDateTime]'
+    }, {
+        option: '-c, --clientState [clientState]'
     });
 }, _SpoListWebhookSetCommand_initValidators = function _SpoListWebhookSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
@@ -119,8 +118,8 @@ _SpoListWebhookSetCommand_instances = new WeakSet(), _SpoListWebhookSetCommand_i
                 return `${args.options.listId} is not a valid GUID`;
             }
         }
-        if (!args.options.notificationUrl && !args.options.expirationDateTime) {
-            return 'Specify notificationUrl, expirationDateTime or both, at least one is required';
+        if (!args.options.notificationUrl && !args.options.expirationDateTime && !args.options.clientState) {
+            return 'Specify notificationUrl, expirationDateTime, clientState or multiple, at least one is required';
         }
         const parsedDateTime = Date.parse(args.options.expirationDateTime);
         if (args.options.expirationDateTime && !(!parsedDateTime) !== true) {
@@ -133,7 +132,7 @@ _SpoListWebhookSetCommand_instances = new WeakSet(), _SpoListWebhookSetCommand_i
         return true;
     }));
 }, _SpoListWebhookSetCommand_initOptionSets = function _SpoListWebhookSetCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
 };
 module.exports = new SpoListWebhookSetCommand();
 //# sourceMappingURL=list-webhook-set.js.map

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

@@ -225,7 +225,7 @@ _SpoListItemAddCommand_instances = new WeakSet(), _SpoListItemAddCommand_initTel
 }, _SpoListItemAddCommand_initTypes = function _SpoListItemAddCommand_initTypes() {
     this.types.string.push('webUrl', 'listId', 'listTitle', 'listUrl', 'contentType', 'folder');
 }, _SpoListItemAddCommand_initOptionSets = function _SpoListItemAddCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
 };
 module.exports = new SpoListItemAddCommand();
 //# sourceMappingURL=listitem-add.js.map

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

@@ -112,7 +112,7 @@ _SpoListItemAttachmentListCommand_instances = new WeakSet(), _SpoListItemAttachm
         return true;
     }));
 }, _SpoListItemAttachmentListCommand_initOptionSets = function _SpoListItemAttachmentListCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
 };
 module.exports = new SpoListItemAttachmentListCommand();
 //# sourceMappingURL=listitem-attachment-list.js.map

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

@@ -0,0 +1,202 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    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 __asyncValues = (this && this.__asyncValues) || function (o) {
+    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+    var m = o[Symbol.asyncIterator], i;
+    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
+    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
+    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
+};
+var _SpoListItemBatchAddCommand_instances, _SpoListItemBatchAddCommand_initTelemetry, _SpoListItemBatchAddCommand_initOptions, _SpoListItemBatchAddCommand_initValidators, _SpoListItemBatchAddCommand_initTypes, _SpoListItemBatchAddCommand_initOptionSets;
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs = require("fs");
+const request_1 = require("../../../../request");
+const uuid_1 = require("uuid");
+const formatting_1 = require("../../../../utils/formatting");
+const urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+class SpoListItemBatchAddCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoListItemBatchAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoListItemBatchAddCommand_instances, "m", _SpoListItemBatchAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoListItemBatchAddCommand_instances, "m", _SpoListItemBatchAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoListItemBatchAddCommand_instances, "m", _SpoListItemBatchAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoListItemBatchAddCommand_instances, "m", _SpoListItemBatchAddCommand_initTypes).call(this);
+        __classPrivateFieldGet(this, _SpoListItemBatchAddCommand_instances, "m", _SpoListItemBatchAddCommand_initOptionSets).call(this);
+    }
+    allowUnknownOptions() {
+        return true;
+    }
+    get name() {
+        return commands_1.default.LISTITEM_BATCH_ADD;
+    }
+    get description() {
+        return 'Creates list items in a batch';
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                if (this.verbose) {
+                    logger.logToStderr(`Starting to create batch items from csv at path ${args.options.filePath}`);
+                }
+                const csvContent = fs.readFileSync(args.options.filePath, 'utf8');
+                const jsonContent = formatting_1.formatting.parseCsvToJson(csvContent);
+                yield this.addItemsAsBatch(jsonContent, args.options, logger);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    addItemsAsBatch(rows, options, logger) {
+        var e_1, _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestUrl = this.getRequestUrl(options);
+            let itemsToAdd = [];
+            try {
+                for (var _b = __asyncValues(rows.entries()), _c; _c = yield _b.next(), !_c.done;) {
+                    const [index, row] = _c.value;
+                    itemsToAdd.push(this.getSingleItemRequestBody(row));
+                    if (itemsToAdd.length === 100) {
+                        if (this.verbose) {
+                            logger.logToStderr(`Writing away batch of items, currently at: ${index + 1}/${rows.length}.`);
+                        }
+                        yield this.postBatchData(itemsToAdd, options.webUrl, requestUrl);
+                        itemsToAdd = [];
+                    }
+                }
+            }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (_c && !_c.done && (_a = _b.return)) yield _a.call(_b);
+                }
+                finally { if (e_1) throw e_1.error; }
+            }
+            if (itemsToAdd.length) {
+                if (this.verbose) {
+                    logger.logToStderr(`Writing away ${itemsToAdd.length} items.`);
+                }
+                yield this.postBatchData(itemsToAdd, options.webUrl, requestUrl);
+            }
+        });
+    }
+    postBatchData(itemsToAdd, webUrl, requestUrl) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const batchId = (0, uuid_1.v4)();
+            const requestBody = this.parseBatchRequestBody(itemsToAdd, batchId, requestUrl);
+            const requestOptions = {
+                url: `${webUrl}/_api/$batch`,
+                headers: {
+                    'Content-Type': `multipart/mixed; boundary=batch_${batchId}`,
+                    'Accept': 'application/json;odata=verbose'
+                },
+                data: requestBody.join('')
+            };
+            yield request_1.default.post(requestOptions);
+        });
+    }
+    parseBatchRequestBody(items, batchId, requestUrl) {
+        const changeSetId = (0, uuid_1.v4)();
+        const batchBody = [];
+        // add default batch body headers
+        batchBody.push(`--batch_${batchId}\n`);
+        batchBody.push(`Content-Type: multipart/mixed; boundary="changeset_${changeSetId}"\n\n`);
+        batchBody.push('Content-Transfer-Encoding: binary\n\n');
+        items.forEach((item) => {
+            batchBody.push(`--changeset_${changeSetId}\n`);
+            batchBody.push('Content-Type: application/http\n');
+            batchBody.push('Content-Transfer-Encoding: binary\n\n');
+            batchBody.push(`POST ${requestUrl} HTTP/1.1\n`);
+            batchBody.push(`Accept: application/json;odata=nometadata\n`);
+            batchBody.push(`Content-Type: application/json;odata=verbose\n`);
+            batchBody.push(`If-Match: *\n\n`);
+            batchBody.push(`{\n"formValues": ${JSON.stringify(item)}\n}`);
+        });
+        // close batch body
+        batchBody.push(`\n\n`);
+        batchBody.push(`--changeset_${changeSetId}--\n\n`);
+        batchBody.push(`--batch_${batchId}--\n`);
+        return batchBody;
+    }
+    getSingleItemRequestBody(row) {
+        const requestBody = [];
+        Object.keys(row).forEach(key => {
+            // have to do 'toString()' or the API will complain when entering a numeric field
+            requestBody.push({ FieldName: key, FieldValue: row[key].toString() });
+        });
+        return requestBody;
+    }
+    getRequestUrl(options) {
+        let listUrl = `${options.webUrl}/_api/web`;
+        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)}')`;
+        }
+        return `${listUrl}/AddValidateUpdateItemUsingPath`;
+    }
+}
+_SpoListItemBatchAddCommand_instances = new WeakSet(), _SpoListItemBatchAddCommand_initTelemetry = function _SpoListItemBatchAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            listId: typeof args.options.listId !== 'undefined',
+            listTitle: typeof args.options.listTitle !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined'
+        });
+    });
+}, _SpoListItemBatchAddCommand_initOptions = function _SpoListItemBatchAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-p, --filePath <filePath>'
+    }, {
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-l, --listId [listId]'
+    }, {
+        option: '-t, --listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
+    });
+}, _SpoListItemBatchAddCommand_initValidators = function _SpoListItemBatchAddCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
+        if (isValidSharePointUrl !== true) {
+            return isValidSharePointUrl;
+        }
+        if (args.options.listId &&
+            !validation_1.validation.isValidGuid(args.options.listId)) {
+            return `${args.options.listId} in option listId is not a valid GUID`;
+        }
+        if (!fs.existsSync(args.options.filePath)) {
+            return `File with path ${args.options.filePath} does not exist`;
+        }
+        return true;
+    }));
+}, _SpoListItemBatchAddCommand_initTypes = function _SpoListItemBatchAddCommand_initTypes() {
+    this.types.string.push('webUrl', 'filePath', 'listId', 'listTitle', 'listUrl');
+}, _SpoListItemBatchAddCommand_initOptionSets = function _SpoListItemBatchAddCommand_initOptionSets() {
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
+};
+module.exports = new SpoListItemBatchAddCommand();
+//# sourceMappingURL=listitem-batch-add.js.map

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

@@ -20,7 +20,9 @@ const formatting_1 = require("../../../../utils/formatting");
 const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
+const base_permissions_1 = require("../../base-permissions");
 const commands_1 = require("../../commands");
+const RoleType_1 = require("../roledefinition/RoleType");
 class SpoListItemGetCommand extends SpoCommand_1.default {
     constructor() {
         super();
@@ -59,29 +61,48 @@ class SpoListItemGetCommand extends SpoCommand_1.default {
             const expandPropertiesArray = propertiesToExpand.filter((item, pos) => propertiesToExpand.indexOf(item) === pos);
             const fieldExpand = expandPropertiesArray.length > 0 ? `&$expand=${expandPropertiesArray.join(",")}` : ``;
             const requestOptions = {
-                url: `${requestUrl}/items(${args.options.id})?$select=${encodeURIComponent(propertiesSelect.join(","))}${fieldExpand}`,
+                url: `${requestUrl}/items(${args.options.id})?$select=${formatting_1.formatting.encodeQueryParameter(propertiesSelect.join(","))}${fieldExpand}`,
                 headers: {
                     'accept': 'application/json;odata=nometadata'
                 },
                 responseType: 'json'
             };
             try {
-                const response = yield request_1.default.get(requestOptions);
-                delete response['ID'];
-                logger.log(response);
+                const itemProperties = yield request_1.default.get(requestOptions);
+                if (args.options.withPermissions) {
+                    requestOptions.url = `${requestUrl}/items(${args.options.id})/RoleAssignments?$expand=Member,RoleDefinitionBindings`;
+                    const response = yield request_1.default.get(requestOptions);
+                    const roleAssignments = this.setFriendlyPermissions(response.value);
+                    itemProperties.RoleAssignments = roleAssignments;
+                }
+                delete itemProperties['ID'];
+                logger.log(itemProperties);
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);
             }
         });
     }
+    setFriendlyPermissions(response) {
+        response.forEach((r) => {
+            r.RoleDefinitionBindings.forEach((r) => {
+                const permissions = new base_permissions_1.BasePermissions();
+                permissions.high = r.BasePermissions.High;
+                permissions.low = r.BasePermissions.Low;
+                r.BasePermissionsValue = permissions.parse();
+                r.RoleTypeKindValue = RoleType_1.RoleType[r.RoleTypeKind];
+            });
+        });
+        return response;
+    }
 }
 _SpoListItemGetCommand_instances = new WeakSet(), _SpoListItemGetCommand_initTelemetry = function _SpoListItemGetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
-            listUrl: typeof args.options.listUrl !== 'undefined'
+            listUrl: typeof args.options.listUrl !== 'undefined',
+            withPermissions: !!args.options.withPermissions
         });
     });
 }, _SpoListItemGetCommand_initOptions = function _SpoListItemGetCommand_initOptions() {
@@ -97,6 +118,8 @@ _SpoListItemGetCommand_instances = new WeakSet(), _SpoListItemGetCommand_initTel
         option: '--listUrl [listUrl]'
     }, {
         option: '-p, --properties [properties]'
+    }, {
+        option: '--withPermissions'
     });
 }, _SpoListItemGetCommand_initValidators = function _SpoListItemGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
@@ -116,7 +139,7 @@ _SpoListItemGetCommand_instances = new WeakSet(), _SpoListItemGetCommand_initTel
 }, _SpoListItemGetCommand_initTypes = function _SpoListItemGetCommand_initTypes() {
     this.types.string.push('webUrl', 'listId', 'listTitle', 'id', 'properties');
 }, _SpoListItemGetCommand_initOptionSets = function _SpoListItemGetCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
 };
 module.exports = new SpoListItemGetCommand();
 //# sourceMappingURL=listitem-get.js.map

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

@@ -165,7 +165,7 @@ _SpoListItemIsRecordCommand_instances = new WeakSet(), _SpoListItemIsRecordComma
         return true;
     }));
 }, _SpoListItemIsRecordCommand_initOptionSets = function _SpoListItemIsRecordCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
 };
 module.exports = new SpoListItemIsRecordCommand();
 //# sourceMappingURL=listitem-isrecord.js.map

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

@@ -13,7 +13,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 _SpoListItemListCommand_instances, _SpoListItemListCommand_initTelemetry, _SpoListItemListCommand_initOptions, _SpoListItemListCommand_initValidators, _SpoListItemListCommand_initTypes;
+var _SpoListItemListCommand_instances, _SpoListItemListCommand_initTelemetry, _SpoListItemListCommand_initOptions, _SpoListItemListCommand_initValidators, _SpoListItemListCommand_initOptionSets, _SpoListItemListCommand_initTypes;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
@@ -29,6 +29,7 @@ class SpoListItemListCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoListItemListCommand_instances, "m", _SpoListItemListCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoListItemListCommand_instances, "m", _SpoListItemListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListItemListCommand_instances, "m", _SpoListItemListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoListItemListCommand_instances, "m", _SpoListItemListCommand_initOptionSets).call(this);
         __classPrivateFieldGet(this, _SpoListItemListCommand_instances, "m", _SpoListItemListCommand_initTypes).call(this);
     }
     get name() {
@@ -39,12 +40,6 @@ class SpoListItemListCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            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.`);
-            }
             let requestUrl = `${args.options.webUrl}/_api/web`;
             if (args.options.listId) {
                 requestUrl += `/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`;
@@ -52,12 +47,6 @@ class SpoListItemListCommand extends SpoCommand_1.default {
             else if (args.options.listTitle) {
                 requestUrl += `/lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
             }
-            else if (args.options.id) {
-                requestUrl += `/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.id)}')`;
-            }
-            else if (args.options.title) {
-                requestUrl += `/lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.title)}')`;
-            }
             else if (args.options.listUrl) {
                 const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
                 requestUrl += `/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
@@ -79,7 +68,7 @@ class SpoListItemListCommand extends SpoCommand_1.default {
                 let res;
                 if (args.options.pageNumber && Number(args.options.pageNumber) > 0) {
                     const rowLimit = `$top=${Number(args.options.pageSize) * Number(args.options.pageNumber)}`;
-                    const filter = args.options.filter ? `$filter=${encodeURIComponent(args.options.filter)}` : ``;
+                    const filter = args.options.filter ? `$filter=${formatting_1.formatting.encodeQueryParameter(args.options.filter)}` : ``;
                     const fieldSelect = `?$select=Id&${rowLimit}&${filter}`;
                     const requestOptions = {
                         url: `${requestUrl}/items${fieldSelect}`,
@@ -94,10 +83,10 @@ class SpoListItemListCommand extends SpoCommand_1.default {
                 const skipTokenId = (res && res.value && res.value.length && res.value[res.value.length - 1]) ? res.value[res.value.length - 1].Id : 0;
                 const skipToken = (args.options.pageNumber && Number(args.options.pageNumber) > 0 && skipTokenId > 0) ? `$skiptoken=Paged=TRUE%26p_ID=${res.value[res.value.length - 1].Id}` : ``;
                 const rowLimit = args.options.pageSize ? `$top=${args.options.pageSize}` : ``;
-                const filter = args.options.filter ? `$filter=${encodeURIComponent(args.options.filter)}` : ``;
+                const filter = args.options.filter ? `$filter=${formatting_1.formatting.encodeQueryParameter(args.options.filter)}` : ``;
                 const fieldExpand = expandFieldsArray.length > 0 ? `&$expand=${expandFieldsArray.join(",")}` : ``;
                 const fieldSelect = fieldsArray.length > 0 ?
-                    `?$select=${encodeURIComponent(fieldsArray.join(","))}${fieldExpand}&${rowLimit}&${skipToken}&${filter}` :
+                    `?$select=${formatting_1.formatting.encodeQueryParameter(fieldsArray.join(","))}${fieldExpand}&${rowLimit}&${skipToken}&${filter}` :
                     `?${rowLimit}&${skipToken}&${filter}`;
                 const requestBody = args.options.camlQuery ?
                     {
@@ -128,11 +117,9 @@ class SpoListItemListCommand extends SpoCommand_1.default {
 _SpoListItemListCommand_instances = new WeakSet(), _SpoListItemListCommand_initTelemetry = function _SpoListItemListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            id: typeof args.options.id !== 'undefined',
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
             listUrl: typeof args.options.listUrl !== 'undefined',
-            title: typeof args.options.title !== 'undefined',
             fields: typeof args.options.fields !== 'undefined',
             filter: typeof args.options.filter !== 'undefined',
             pageNumber: typeof args.options.pageNumber !== 'undefined',
@@ -143,10 +130,6 @@ _SpoListItemListCommand_instances = new WeakSet(), _SpoListItemListCommand_initT
 }, _SpoListItemListCommand_initOptions = function _SpoListItemListCommand_initOptions() {
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '--id [id]'
-    }, {
-        option: '--title [title]'
     }, {
         option: '-i, --listId [listId]'
     }, {
@@ -170,16 +153,6 @@ _SpoListItemListCommand_instances = new WeakSet(), _SpoListItemListCommand_initT
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        if (!args.options.id && !args.options.title && !args.options.listId && !args.options.listTitle && !args.options.listUrl) {
-            return `Specify listId or listTitle or listUrl`;
-        }
-        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, args.options.listUrl].filter(o => o).length > 1) {
-            return 'Specify listId or listTitle or listUrl but not multiple';
-        }
         if (args.options.camlQuery && args.options.fields) {
             return `Specify camlQuery or fields but not both`;
         }
@@ -201,13 +174,12 @@ _SpoListItemListCommand_instances = new WeakSet(), _SpoListItemListCommand_initT
         if (args.options.listId && !validation_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} is not a valid GUID`;
         }
-        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} in option id is not a valid GUID`;
-        }
         return true;
     }));
+}, _SpoListItemListCommand_initOptionSets = function _SpoListItemListCommand_initOptionSets() {
+    this.optionSets.push({ options: ['listId', 'listTitle'] });
 }, _SpoListItemListCommand_initTypes = function _SpoListItemListCommand_initTypes() {
-    this.types.string.push('webUrl', 'id', 'title', 'camlQuery', 'pageSize', 'pageNumber', 'fields', 'filter');
+    this.types.string.push('webUrl', 'camlQuery', 'pageSize', 'pageNumber', 'fields', 'filter');
 };
 module.exports = new SpoListItemListCommand();
 //# sourceMappingURL=listitem-list.js.map

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

@@ -68,7 +68,7 @@ class SpoListItemRecordDeclareCommand extends SpoCommand_1.default {
                 const formDigestValue = contextResponse.FormDigestValue;
                 const webIdentityResp = yield spo_1.spo.getCurrentWebIdentity(args.options.webUrl, formDigestValue);
                 const webIdentity = webIdentityResp.objectIdentity;
-                const requestBody = this.getDeclareRecordRequestBody(webIdentity, listId, args.options.id, args.options.date || '');
+                const requestBody = this.getDeclareRecordRequestBody(webIdentity, listId, args.options.listItemId, args.options.date || '');
                 const requestOptions = {
                     url: `${args.options.webUrl}/_vti_bin/client.svc/ProcessQuery`,
                     headers: {
@@ -123,7 +123,7 @@ _SpoListItemRecordDeclareCommand_instances = new WeakSet(), _SpoListItemRecordDe
     }, {
         option: '--listUrl [listUrl]'
     }, {
-        option: '-i, --id <id>'
+        option: '-i, --listItemId <listItemId>'
     }, {
         option: '-d, --date [date]'
     });
@@ -136,9 +136,9 @@ _SpoListItemRecordDeclareCommand_instances = new WeakSet(), _SpoListItemRecordDe
         if (args.options.listId && !validation_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} in option listId is not a valid GUID`;
         }
-        const id = parseInt(args.options.id);
+        const id = parseInt(args.options.listItemId);
         if (isNaN(id)) {
-            return `${args.options.id} is not a number`;
+            return `${args.options.listItemId} is not a number`;
         }
         if (id < 1) {
             return `Item ID must be a positive number`;
@@ -149,7 +149,7 @@ _SpoListItemRecordDeclareCommand_instances = new WeakSet(), _SpoListItemRecordDe
         return true;
     }));
 }, _SpoListItemRecordDeclareCommand_initOptionSets = function _SpoListItemRecordDeclareCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
 };
 module.exports = new SpoListItemRecordDeclareCommand();
 //# sourceMappingURL=listitem-record-declare.js.map

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

@@ -79,7 +79,7 @@ class SpoListItemRecordUndeclareCommand extends SpoCommand_1.default {
                         'Content-Type': 'text/xml',
                         'X-RequestDigest': formDigestValue
                     },
-                    data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><StaticMethod TypeId="{ea8e1356-5910-4e69-bc05-d0c30ed657fc}" Name="UndeclareItemAsRecord" Id="53"><Parameters><Parameter ObjectPathId="49" /></Parameters></StaticMethod></Actions><ObjectPaths><Identity Id="49" Name="${objectIdentity.objectIdentity}:list:${listId}:item:${args.options.id},1" /></ObjectPaths></Request>`
+                    data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><StaticMethod TypeId="{ea8e1356-5910-4e69-bc05-d0c30ed657fc}" Name="UndeclareItemAsRecord" Id="53"><Parameters><Parameter ObjectPathId="49" /></Parameters></StaticMethod></Actions><ObjectPaths><Identity Id="49" Name="${objectIdentity.objectIdentity}:list:${listId}:item:${args.options.listItemId},1" /></ObjectPaths></Request>`
                 };
                 yield request_1.default.post(requestOptions);
                 // REST post call doesn't return anything
@@ -102,7 +102,7 @@ _SpoListItemRecordUndeclareCommand_instances = new WeakSet(), _SpoListItemRecord
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-i, --id <id>'
+        option: '-i, --listItemId <listItemId>'
     }, {
         option: '-l, --listId [listId]'
     }, {
@@ -112,9 +112,9 @@ _SpoListItemRecordUndeclareCommand_instances = new WeakSet(), _SpoListItemRecord
     });
 }, _SpoListItemRecordUndeclareCommand_initValidators = function _SpoListItemRecordUndeclareCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const id = parseInt(args.options.id);
+        const id = parseInt(args.options.listItemId);
         if (isNaN(id)) {
-            return `${args.options.id} is not a valid list item ID`;
+            return `${args.options.listItemId} is not a valid list item ID`;
         }
         const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
@@ -127,7 +127,7 @@ _SpoListItemRecordUndeclareCommand_instances = new WeakSet(), _SpoListItemRecord
         return true;
     }));
 }, _SpoListItemRecordUndeclareCommand_initOptionSets = function _SpoListItemRecordUndeclareCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
 };
 module.exports = new SpoListItemRecordUndeclareCommand();
 //# sourceMappingURL=listitem-record-undeclare.js.map

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

@@ -136,7 +136,7 @@ _SpoListItemRemoveCommand_instances = new WeakSet(), _SpoListItemRemoveCommand_i
         return true;
     }));
 }, _SpoListItemRemoveCommand_initOptionSets = function _SpoListItemRemoveCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
 };
 module.exports = new SpoListItemRemoveCommand();
 //# sourceMappingURL=listitem-remove.js.map

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

@@ -13,7 +13,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 _SpoListItemRoleAssignmentRemoveCommand_instances, _SpoListItemRoleAssignmentRemoveCommand_initTelemetry, _SpoListItemRoleAssignmentRemoveCommand_initOptions, _SpoListItemRoleAssignmentRemoveCommand_initValidators;
+var _SpoListItemRoleAssignmentRemoveCommand_instances, _SpoListItemRoleAssignmentRemoveCommand_initTelemetry, _SpoListItemRoleAssignmentRemoveCommand_initOptions, _SpoListItemRoleAssignmentRemoveCommand_initValidators, _SpoListItemRoleAssignmentRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
@@ -31,6 +31,7 @@ class SpoListItemRoleAssignmentRemoveCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoListItemRoleAssignmentRemoveCommand_instances, "m", _SpoListItemRoleAssignmentRemoveCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoListItemRoleAssignmentRemoveCommand_instances, "m", _SpoListItemRoleAssignmentRemoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListItemRoleAssignmentRemoveCommand_instances, "m", _SpoListItemRoleAssignmentRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoListItemRoleAssignmentRemoveCommand_instances, "m", _SpoListItemRoleAssignmentRemoveCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.LISTITEM_ROLEASSIGNMENT_REMOVE;
@@ -185,22 +186,10 @@ _SpoListItemRoleAssignmentRemoveCommand_instances = new WeakSet(), _SpoListItemR
         if (args.options.principalId && isNaN(args.options.principalId)) {
             return `Specified principalId ${args.options.principalId} is not a number`;
         }
-        const listOptions = [args.options.listId, args.options.listTitle, args.options.listUrl];
-        if (listOptions.some(item => item !== undefined) && listOptions.filter(item => item !== undefined).length > 1) {
-            return `Specify either list id or title or list url`;
-        }
-        if (listOptions.filter(item => item !== undefined).length === 0) {
-            return `Specify at least list id or title or list url`;
-        }
-        const principalOptions = [args.options.principalId, args.options.upn, args.options.groupName];
-        if (principalOptions.some(item => item !== undefined) && principalOptions.filter(item => item !== undefined).length > 1) {
-            return `Specify either principalId id or upn or groupName`;
-        }
-        if (principalOptions.filter(item => item !== undefined).length === 0) {
-            return `Specify at least principalId id or upn or groupName`;
-        }
         return true;
     }));
+}, _SpoListItemRoleAssignmentRemoveCommand_initOptionSets = function _SpoListItemRoleAssignmentRemoveCommand_initOptionSets() {
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] }, { options: ['principalId', 'upn', 'groupName'] });
 };
 module.exports = new SpoListItemRoleAssignmentRemoveCommand();
 //# sourceMappingURL=listitem-roleassignment-remove.js.map