@pnp/cli-microsoft365 6.0.0-beta.dc71aa3 → 6.0.0-beta.dc8d53d

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

@@ -137,7 +137,7 @@ _SpoListWebhookAddCommand_instances = new WeakSet(), _SpoListWebhookAddCommand_i
         return true;
     }));
 }, _SpoListWebhookAddCommand_initOptionSets = function _SpoListWebhookAddCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
 };
 module.exports = new SpoListWebhookAddCommand();
 //# sourceMappingURL=list-webhook-add.js.map

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

@@ -111,7 +111,7 @@ _SpoListWebhookGetCommand_instances = new WeakSet(), _SpoListWebhookGetCommand_i
         return true;
     }));
 }, _SpoListWebhookGetCommand_initOptionSets = function _SpoListWebhookGetCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
 };
 module.exports = new SpoListWebhookGetCommand();
 //# sourceMappingURL=list-webhook-get.js.map

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

@@ -15,8 +15,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoListWebhookListCommand_instances, _SpoListWebhookListCommand_initTelemetry, _SpoListWebhookListCommand_initOptions, _SpoListWebhookListCommand_initValidators, _SpoListWebhookListCommand_initOptionSets;
 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");
@@ -55,21 +55,13 @@ class SpoListWebhookListCommand extends SpoCommand_1.default {
                 const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
                 requestUrl += `/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/Subscriptions`;
             }
-            const requestOptions = {
-                url: requestUrl,
-                method: 'GET',
-                headers: {
-                    'accept': 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
             try {
-                const res = yield request_1.default.get(requestOptions);
-                if (res.value && res.value.length > 0) {
-                    res.value.forEach(w => {
+                const res = yield odata_1.odata.getAllItems(requestUrl);
+                if (res && res.length > 0) {
+                    res.forEach(w => {
                         w.clientState = w.clientState || '';
                     });
-                    logger.log(res.value);
+                    logger.log(res);
                 }
                 else {
                     if (this.verbose) {
@@ -115,7 +107,7 @@ _SpoListWebhookListCommand_instances = new WeakSet(), _SpoListWebhookListCommand
         return true;
     }));
 }, _SpoListWebhookListCommand_initOptionSets = function _SpoListWebhookListCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
 };
 module.exports = new SpoListWebhookListCommand();
 //# sourceMappingURL=list-webhook-list.js.map

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

@@ -129,7 +129,7 @@ _SpoListWebhookRemoveCommand_instances = new WeakSet(), _SpoListWebhookRemoveCom
         return true;
     }));
 }, _SpoListWebhookRemoveCommand_initOptionSets = function _SpoListWebhookRemoveCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
 };
 module.exports = new SpoListWebhookRemoveCommand();
 //# sourceMappingURL=list-webhook-remove.js.map

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

@@ -132,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();
@@ -66,22 +68,41 @@ class SpoListItemGetCommand extends SpoCommand_1.default {
                 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

@@ -177,7 +177,7 @@ _SpoListItemListCommand_instances = new WeakSet(), _SpoListItemListCommand_initT
         return true;
     }));
 }, _SpoListItemListCommand_initOptionSets = function _SpoListItemListCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle']);
+    this.optionSets.push({ options: ['listId', 'listTitle'] });
 }, _SpoListItemListCommand_initTypes = function _SpoListItemListCommand_initTypes() {
     this.types.string.push('webUrl', 'camlQuery', 'pageSize', 'pageNumber', 'fields', 'filter');
 };

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

@@ -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

@@ -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

@@ -189,7 +189,7 @@ _SpoListItemRoleAssignmentRemoveCommand_instances = new WeakSet(), _SpoListItemR
         return true;
     }));
 }, _SpoListItemRoleAssignmentRemoveCommand_initOptionSets = function _SpoListItemRoleAssignmentRemoveCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle', 'listUrl'], ['principalId', 'upn', 'groupName']);
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] }, { options: ['principalId', 'upn', 'groupName'] });
 };
 module.exports = new SpoListItemRoleAssignmentRemoveCommand();
 //# sourceMappingURL=listitem-roleassignment-remove.js.map

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

@@ -133,7 +133,7 @@ _SpoListItemRoleInheritanceBreakCommand_instances = new WeakSet(), _SpoListItemR
         return true;
     }));
 }, _SpoListItemRoleInheritanceBreakCommand_initOptionSets = function _SpoListItemRoleInheritanceBreakCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
 };
 module.exports = new SpoListItemRoleInheritanceBreakCommand();
 //# sourceMappingURL=listitem-roleinheritance-break.js.map

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

@@ -126,7 +126,7 @@ _SpoListItemRoleInheritanceResetCommand_instances = new WeakSet(), _SpoListItemR
         return true;
     }));
 }, _SpoListItemRoleInheritanceResetCommand_initOptionSets = function _SpoListItemRoleInheritanceResetCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
 };
 module.exports = new SpoListItemRoleInheritanceResetCommand();
 //# sourceMappingURL=listitem-roleinheritance-reset.js.map

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

@@ -322,7 +322,7 @@ _SpoListItemSetCommand_instances = new WeakSet(), _SpoListItemSetCommand_initTel
     this.types.string.push('webUrl', 'listId', 'listTitle', 'listUrl', 'id', 'contentType');
     this.types.boolean.push('systemUpdate');
 }, _SpoListItemSetCommand_initOptionSets = function _SpoListItemSetCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
 };
 module.exports = new SpoListItemSetCommand();
 //# sourceMappingURL=listitem-set.js.map

package/dist/m365/spo/commands/navigation/navigation-node-list.js

@@ -15,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoNavigationNodeListCommand_instances, _SpoNavigationNodeListCommand_initTelemetry, _SpoNavigationNodeListCommand_initOptions, _SpoNavigationNodeListCommand_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");
@@ -38,16 +38,9 @@ class SpoNavigationNodeListCommand extends SpoCommand_1.default {
             if (this.verbose) {
                 logger.logToStderr(`Retrieving navigation nodes...`);
             }
-            const requestOptions = {
-                url: `${args.options.webUrl}/_api/web/navigation/${args.options.location.toLowerCase()}`,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
             try {
-                const res = yield request_1.default.get(requestOptions);
-                logger.log(res.value.map(n => {
+                const res = yield odata_1.odata.getAllItems(`${args.options.webUrl}/_api/web/navigation/${args.options.location.toLowerCase()}`);
+                logger.log(res.map(n => {
                     return {
                         Id: n.Id,
                         Title: n.Title,

package/dist/m365/spo/commands/page/page-clientsidewebpart-add.js

@@ -400,7 +400,7 @@ _SpoPageClientSideWebPartAddCommand_instances = new WeakSet(), _SpoPageClientSid
         return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 }, _SpoPageClientSideWebPartAddCommand_initOptionSets = function _SpoPageClientSideWebPartAddCommand_initOptionSets() {
-    this.optionSets.push(['standardWebPart', 'webPartId']);
+    this.optionSets.push({ options: ['standardWebPart', 'webPartId'] });
 };
 module.exports = new SpoPageClientSideWebPartAddCommand();
 //# sourceMappingURL=page-clientsidewebpart-add.js.map

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

@@ -15,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoPageListCommand_instances, _SpoPageListCommand_initOptions, _SpoPageListCommand_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");
@@ -41,28 +41,14 @@ class SpoPageListCommand extends SpoCommand_1.default {
                 if (this.verbose) {
                     logger.logToStderr(`Retrieving client-side pages...`);
                 }
-                let requestOptions = {
-                    url: `${args.options.webUrl}/_api/sitepages/pages?$orderby=Title`,
-                    headers: {
-                        accept: 'application/json;odata=nometadata'
-                    },
-                    responseType: 'json'
-                };
                 let pages = [];
-                const pagesList = yield request_1.default.get(requestOptions);
-                requestOptions = {
-                    url: `${args.options.webUrl}/_api/web/lists/SitePages/rootfolder/files?$expand=ListItemAllFields/ClientSideApplicationId&$orderby=Name`,
-                    headers: {
-                        accept: 'application/json;odata=nometadata'
-                    },
-                    responseType: 'json'
-                };
-                if (pagesList.value && pagesList.value.length > 0) {
-                    pages = pagesList.value;
+                const pagesList = yield odata_1.odata.getAllItems(`${args.options.webUrl}/_api/sitepages/pages?$orderby=Title`);
+                if (pagesList && pagesList.length > 0) {
+                    pages = pagesList;
                 }
-                const res = yield request_1.default.get(requestOptions);
-                if (res.value && res.value.length > 0) {
-                    const clientSidePages = res.value.filter(p => p.ListItemAllFields.ClientSideApplicationId === 'b6917cb1-93a0-4b97-a84d-7cf49975d4ec');
+                const res = yield odata_1.odata.getAllItems(`${args.options.webUrl}/_api/web/lists/SitePages/rootfolder/files?$expand=ListItemAllFields/ClientSideApplicationId&$orderby=Name`);
+                if (res && res.length > 0) {
+                    const clientSidePages = res.filter(p => p.ListItemAllFields.ClientSideApplicationId === 'b6917cb1-93a0-4b97-a84d-7cf49975d4ec');
                     pages = pages.map(p => {
                         const clientSidePage = clientSidePages.find(cp => cp && cp.ListItemAllFields && cp.ListItemAllFields.Id === p.Id);
                         if (clientSidePage) {

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

@@ -24,6 +24,9 @@ const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 const Page_1 = require("./Page");
+const spoFileGetCommand = require("../file/file-get");
+const spoListItemSetCommand = require("../listitem/listitem-set");
+const Cli_1 = require("../../../../cli/Cli");
 class SpoPageSetCommand extends SpoCommand_1.default {
     constructor() {
         super();
@@ -55,7 +58,8 @@ class SpoPageSetCommand extends SpoCommand_1.default {
             if (!pageName.endsWith('.aspx')) {
                 pageName += '.aspx';
             }
-            const serverRelativeFileUrl = `${urlUtil_1.urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/sitepages/${pageName}`;
+            const listServerRelativeUrl = `${urlUtil_1.urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/sitepages`;
+            const serverRelativeFileUrl = `${listServerRelativeUrl}/${pageName}`;
             const needsToSavePage = !!args.options.title || !!args.options.description;
             try {
                 const requestDigestResult = yield spo_1.spo.getRequestDigest(args.options.webUrl);
@@ -233,6 +237,27 @@ class SpoPageSetCommand extends SpoCommand_1.default {
                     };
                     yield request_1.default.post(requestOptions);
                 }
+                if (args.options.demoteFrom === 'NewsPage') {
+                    const fileGetOptions = {
+                        webUrl: args.options.webUrl,
+                        url: serverRelativeFileUrl,
+                        asListItem: true,
+                        verbose: this.verbose,
+                        debug: this.debug
+                    };
+                    const fileGetOutput = yield Cli_1.Cli.executeCommandWithOutput(spoFileGetCommand, { options: Object.assign(Object.assign({}, fileGetOptions), { _: [] }) });
+                    const fileGetOutputJson = JSON.parse(fileGetOutput.stdout);
+                    const listItemSetOptions = {
+                        webUrl: args.options.webUrl,
+                        listUrl: listServerRelativeUrl,
+                        id: fileGetOutputJson.Id,
+                        systemUpdate: true,
+                        PromotedState: 0,
+                        verbose: this.verbose,
+                        debug: this.debug
+                    };
+                    yield Cli_1.Cli.executeCommandWithOutput(spoListItemSetCommand, { options: Object.assign(Object.assign({}, listItemSetOptions), { _: [] }) });
+                }
                 let requestOptions;
                 if (!args.options.publish) {
                     if (args.options.promoteAs === 'Template' || !pageId) {
@@ -270,8 +295,9 @@ class SpoPageSetCommand extends SpoCommand_1.default {
 _SpoPageSetCommand_instances = new WeakSet(), _SpoPageSetCommand_initTelemetry = function _SpoPageSetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            layoutType: args.options.layoutType,
-            promoteAs: args.options.promoteAs,
+            layoutType: args.options.layoutType || false,
+            promoteAs: args.options.promoteAs || false,
+            demotefrom: args.options.demoteFrom || false,
             commentsEnabled: args.options.commentsEnabled || false,
             publish: args.options.publish || false,
             publishMessage: typeof args.options.publishMessage !== 'undefined',
@@ -290,6 +316,9 @@ _SpoPageSetCommand_instances = new WeakSet(), _SpoPageSetCommand_initTelemetry =
     }, {
         option: '-p, --promoteAs [promoteAs]',
         autocomplete: Page_1.supportedPromoteAs
+    }, {
+        option: '--demoteFrom [demoteFrom]',
+        autocomplete: ['NewsPage']
     }, {
         option: '--commentsEnabled [commentsEnabled]',
         autocomplete: ['true', 'false']
@@ -316,6 +345,10 @@ _SpoPageSetCommand_instances = new WeakSet(), _SpoPageSetCommand_initTelemetry =
             Page_1.supportedPromoteAs.indexOf(args.options.promoteAs) < 0) {
             return `${args.options.promoteAs} is not a valid option for promoteAs. Allowed values ${Page_1.supportedPromoteAs.join(', ')}`;
         }
+        if (args.options.demoteFrom &&
+            args.options.demoteFrom !== 'NewsPage') {
+            return `${args.options.demoteFrom} is not a valid option for demoteFrom. The only allowed value is 'NewsPage'`;
+        }
         if (args.options.promoteAs === 'HomePage' && args.options.layoutType !== 'Home') {
             return 'You can only promote home pages as site home page';
         }