@pnp/cli-microsoft365 5.7.0 → 5.8.0-beta.119711d

package/dist/m365/spo/commands/listitem/listitem-attachment-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 _SpoListItemAttachmentListCommand_instances, _SpoListItemAttachmentListCommand_initTelemetry, _SpoListItemAttachmentListCommand_initOptions, _SpoListItemAttachmentListCommand_initValidators;
+var _SpoListItemAttachmentListCommand_instances, _SpoListItemAttachmentListCommand_initTelemetry, _SpoListItemAttachmentListCommand_initOptions, _SpoListItemAttachmentListCommand_initValidators, _SpoListItemAttachmentListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -26,6 +26,7 @@ class SpoListItemAttachmentListCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoListItemAttachmentListCommand_instances, "m", _SpoListItemAttachmentListCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoListItemAttachmentListCommand_instances, "m", _SpoListItemAttachmentListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListItemAttachmentListCommand_instances, "m", _SpoListItemAttachmentListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoListItemAttachmentListCommand_instances, "m", _SpoListItemAttachmentListCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.LISTITEM_ATTACHMENT_LIST;
@@ -36,33 +37,36 @@ class SpoListItemAttachmentListCommand extends SpoCommand_1.default {
     defaultProperties() {
         return ['FileName', 'ServerRelativeUrl'];
     }
-    commandAction(logger, args, cb) {
-        const listIdArgument = args.options.listId || '';
-        const listTitleArgument = args.options.listTitle || '';
-        const listRestUrl = (args.options.listId ?
-            `${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',
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((attachmentFiles) => {
-            if (attachmentFiles.AttachmentFiles && attachmentFiles.AttachmentFiles.length > 0) {
-                logger.log(attachmentFiles.AttachmentFiles);
-            }
-            else {
-                if (this.verbose) {
-                    logger.logToStderr('No attachments found');
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const listIdArgument = args.options.listId || '';
+            const listTitleArgument = args.options.listTitle || '';
+            const listRestUrl = (args.options.listId ?
+                `${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',
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            try {
+                const attachmentFiles = yield request_1.default.get(requestOptions);
+                if (attachmentFiles.AttachmentFiles && attachmentFiles.AttachmentFiles.length > 0) {
+                    logger.log(attachmentFiles.AttachmentFiles);
+                }
+                else {
+                    if (this.verbose) {
+                        logger.logToStderr('No attachments found');
+                    }
                 }
             }
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoListItemAttachmentListCommand_instances = new WeakSet(), _SpoListItemAttachmentListCommand_initTelemetry = function _SpoListItemAttachmentListCommand_initTelemetry() {
@@ -88,12 +92,6 @@ _SpoListItemAttachmentListCommand_instances = new WeakSet(), _SpoListItemAttachm
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        if (!args.options.listId && !args.options.listTitle) {
-            return `Specify listId or listTitle`;
-        }
-        if (args.options.listId && args.options.listTitle) {
-            return `Specify listId or listTitle but not both`;
-        }
         if (args.options.listId && !utils_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} in option listId is not a valid GUID`;
         }
@@ -102,6 +100,8 @@ _SpoListItemAttachmentListCommand_instances = new WeakSet(), _SpoListItemAttachm
         }
         return true;
     }));
+}, _SpoListItemAttachmentListCommand_initOptionSets = function _SpoListItemAttachmentListCommand_initOptionSets() {
+    this.optionSets.push(['listId', 'listTitle']);
 };
 module.exports = new SpoListItemAttachmentListCommand();
 //# sourceMappingURL=listitem-attachment-list.js.map

package/dist/m365/spo/commands/listitem/listitem-get.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 _SpoListItemGetCommand_instances, _SpoListItemGetCommand_initTelemetry, _SpoListItemGetCommand_initOptions, _SpoListItemGetCommand_initValidators, _SpoListItemGetCommand_initTypes;
+var _SpoListItemGetCommand_instances, _SpoListItemGetCommand_initTelemetry, _SpoListItemGetCommand_initOptions, _SpoListItemGetCommand_initValidators, _SpoListItemGetCommand_initTypes, _SpoListItemGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -27,6 +27,7 @@ class SpoListItemGetCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoListItemGetCommand_instances, "m", _SpoListItemGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListItemGetCommand_instances, "m", _SpoListItemGetCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _SpoListItemGetCommand_instances, "m", _SpoListItemGetCommand_initTypes).call(this);
+        __classPrivateFieldGet(this, _SpoListItemGetCommand_instances, "m", _SpoListItemGetCommand_initOptionSets).call(this);
     }
     allowUnknownOptions() {
         return true;
@@ -37,31 +38,34 @@ class SpoListItemGetCommand extends SpoCommand_1.default {
     get description() {
         return 'Gets a list item from the specified list';
     }
-    commandAction(logger, args, cb) {
-        const listIdArgument = args.options.listId || '';
-        const listTitleArgument = args.options.listTitle || '';
-        const listRestUrl = (args.options.listId ?
-            `${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 ? args.options.properties.split(',') : [];
-        const propertiesWithSlash = propertiesSelect.filter(item => item.includes('/'));
-        const propertiesToExpand = propertiesWithSlash.map(e => e.split('/')[0]);
-        const expandPropertiesArray = propertiesToExpand.filter((item, pos) => propertiesToExpand.indexOf(item) === pos);
-        const fieldExpand = expandPropertiesArray.length > 0 ? `&$expand=${expandPropertiesArray.join(",")}` : ``;
-        const requestOptions = {
-            url: `${listRestUrl}/items(${args.options.id})?$select=${encodeURIComponent(propertiesSelect.join(","))}${fieldExpand}`,
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((response) => {
-            delete response['ID'];
-            logger.log(response);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const listIdArgument = args.options.listId || '';
+            const listTitleArgument = args.options.listTitle || '';
+            const listRestUrl = (args.options.listId ?
+                `${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 ? args.options.properties.split(',') : [];
+            const propertiesWithSlash = propertiesSelect.filter(item => item.includes('/'));
+            const propertiesToExpand = propertiesWithSlash.map(e => e.split('/')[0]);
+            const expandPropertiesArray = propertiesToExpand.filter((item, pos) => propertiesToExpand.indexOf(item) === pos);
+            const fieldExpand = expandPropertiesArray.length > 0 ? `&$expand=${expandPropertiesArray.join(",")}` : ``;
+            const requestOptions = {
+                url: `${listRestUrl}/items(${args.options.id})?$select=${encodeURIComponent(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);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoListItemGetCommand_instances = new WeakSet(), _SpoListItemGetCommand_initTelemetry = function _SpoListItemGetCommand_initTelemetry() {
@@ -89,12 +93,6 @@ _SpoListItemGetCommand_instances = new WeakSet(), _SpoListItemGetCommand_initTel
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        if (!args.options.listId && !args.options.listTitle) {
-            return `Specify listId or listTitle`;
-        }
-        if (args.options.listId && args.options.listTitle) {
-            return `Specify listId or listTitle but not both`;
-        }
         if (args.options.listId &&
             !utils_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} in option listId is not a valid GUID`;
@@ -106,6 +104,8 @@ _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']);
 };
 module.exports = new SpoListItemGetCommand();
 //# sourceMappingURL=listitem-get.js.map

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

@@ -13,10 +13,9 @@ 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 _SpoListItemIsRecordCommand_instances, _SpoListItemIsRecordCommand_initTelemetry, _SpoListItemIsRecordCommand_initOptions, _SpoListItemIsRecordCommand_initValidators;
+var _SpoListItemIsRecordCommand_instances, _SpoListItemIsRecordCommand_initTelemetry, _SpoListItemIsRecordCommand_initOptions, _SpoListItemIsRecordCommand_initValidators, _SpoListItemIsRecordCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../../Auth");
-const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -29,6 +28,7 @@ class SpoListItemIsRecordCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoListItemIsRecordCommand_instances, "m", _SpoListItemIsRecordCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoListItemIsRecordCommand_instances, "m", _SpoListItemIsRecordCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListItemIsRecordCommand_instances, "m", _SpoListItemIsRecordCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoListItemIsRecordCommand_instances, "m", _SpoListItemIsRecordCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.LISTITEM_ISRECORD;
@@ -36,75 +36,73 @@ class SpoListItemIsRecordCommand extends SpoCommand_1.default {
     get description() {
         return 'Checks if the specified list item is a record';
     }
-    commandAction(logger, args, cb) {
-        const resource = Auth_1.Auth.getResourceFromUrl(args.options.webUrl);
-        const listIdArgument = args.options.listId || '';
-        const listTitleArgument = args.options.listTitle || '';
-        const listRestUrl = (args.options.listId ?
-            `${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) {
-            logger.logToStderr(`Retrieving access token for ${resource}...`);
-        }
-        (() => {
-            if (typeof args.options.listId !== 'undefined') {
-                if (this.verbose) {
-                    logger.logToStderr(`List Id passed in as an argument.`);
-                }
-                return Promise.resolve({ Id: args.options.listId });
-            }
-            if (this.verbose) {
-                logger.logToStderr(`Getting list id...`);
-            }
-            const requestOptions = {
-                url: `${listRestUrl}?$select=Id`,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        })()
-            .then((res) => {
-            listId = res.Id;
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const resource = Auth_1.Auth.getResourceFromUrl(args.options.webUrl);
+            const listIdArgument = args.options.listId || '';
+            const listTitleArgument = args.options.listTitle || '';
+            const listRestUrl = (args.options.listId ?
+                `${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) {
-                logger.logToStderr(`Getting request digest for request`);
-            }
-            return utils_1.spo.getRequestDigest(args.options.webUrl);
-        })
-            .then((res) => {
-            formDigestValue = res.FormDigestValue;
-            return utils_1.spo.getCurrentWebIdentity(args.options.webUrl, formDigestValue);
-        })
-            .then((webIdentityResp) => {
-            if (this.verbose) {
-                logger.logToStderr(`Checking if list item is a record in list ${args.options.listId || args.options.listTitle} in site ${args.options.webUrl}...`);
+                logger.logToStderr(`Retrieving access token for ${resource}...`);
             }
-            const requestBody = this.getIsRecordRequestBody(webIdentityResp.objectIdentity, listId, args.options.id);
-            const requestOptions = {
-                url: `${args.options.webUrl}/_vti_bin/client.svc/ProcessQuery`,
-                headers: {
-                    'Content-Type': 'text/xml',
-                    'X-RequestDigest': formDigestValue
-                },
-                data: requestBody
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then((res) => {
-            const json = JSON.parse(res);
-            const response = json[0];
-            if (response.ErrorInfo) {
-                cb(new Command_1.CommandError(response.ErrorInfo.ErrorMessage));
+            try {
+                if (typeof args.options.listId !== 'undefined') {
+                    if (this.verbose) {
+                        logger.logToStderr(`List Id passed in as an argument.`);
+                    }
+                    listId = args.options.listId;
+                }
+                else {
+                    if (this.verbose) {
+                        logger.logToStderr(`Getting list id...`);
+                    }
+                    const requestOptions = {
+                        url: `${listRestUrl}?$select=Id`,
+                        headers: {
+                            accept: 'application/json;odata=nometadata'
+                        },
+                        responseType: 'json'
+                    };
+                    const list = yield request_1.default.get(requestOptions);
+                    listId = list.Id;
+                }
+                if (this.debug) {
+                    logger.logToStderr(`Getting request digest for request`);
+                }
+                const reqDigest = yield utils_1.spo.getRequestDigest(args.options.webUrl);
+                formDigestValue = reqDigest.FormDigestValue;
+                const webIdentityResp = yield utils_1.spo.getCurrentWebIdentity(args.options.webUrl, formDigestValue);
+                if (this.verbose) {
+                    logger.logToStderr(`Checking if list item is a record in list ${args.options.listId || args.options.listTitle} in site ${args.options.webUrl}...`);
+                }
+                const requestBody = this.getIsRecordRequestBody(webIdentityResp.objectIdentity, listId, args.options.id);
+                const requestOptions = {
+                    url: `${args.options.webUrl}/_vti_bin/client.svc/ProcessQuery`,
+                    headers: {
+                        'Content-Type': 'text/xml',
+                        'X-RequestDigest': formDigestValue
+                    },
+                    data: requestBody
+                };
+                const res = yield request_1.default.post(requestOptions);
+                const json = JSON.parse(res);
+                const response = json[0];
+                if (response.ErrorInfo) {
+                    throw response.ErrorInfo.ErrorMessage;
+                }
+                else {
+                    const result = json[json.length - 1];
+                    logger.log(result);
+                }
             }
-            else {
-                const result = json[json.length - 1];
-                logger.log(result);
-                cb();
+            catch (err) {
+                this.handleRejectedPromise(err);
             }
-        }, (err) => this.handleRejectedPromise(err, logger, cb));
+        });
     }
     getIsRecordRequestBody(webIdentity, listId, id) {
         const requestBody = `<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">
@@ -148,18 +146,14 @@ _SpoListItemIsRecordCommand_instances = new WeakSet(), _SpoListItemIsRecordComma
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        if (!args.options.listId && !args.options.listTitle) {
-            return `Specify listId or listTitle`;
-        }
-        if (args.options.listId && args.options.listTitle) {
-            return `Specify listId or listTitle but not both`;
-        }
         if (args.options.listId &&
             !utils_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} in option listId is not a valid GUID`;
         }
         return true;
     }));
+}, _SpoListItemIsRecordCommand_initOptionSets = function _SpoListItemIsRecordCommand_initOptionSets() {
+    this.optionSets.push(['listId', 'listTitle']);
 };
 module.exports = new SpoListItemIsRecordCommand();
 //# sourceMappingURL=listitem-isrecord.js.map

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

@@ -34,87 +34,80 @@ class SpoListItemListCommand extends SpoCommand_1.default {
     get description() {
         return 'Gets a list of items from the specified list';
     }
-    commandAction(logger, args, cb) {
-        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 fieldsWithSlash = fieldsArray.filter(item => item.includes('/'));
-        const fieldsToExpand = fieldsWithSlash.map(e => e.split('/')[0]);
-        const expandFieldsArray = fieldsToExpand.filter((item, pos) => fieldsToExpand.indexOf(item) === pos);
-        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) {
-                    logger.logToStderr(`getting request digest for query request`);
-                }
-                return utils_1.spo.getRequestDigest(args.options.webUrl);
+    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.`);
             }
-            else {
-                return Promise.resolve();
+            if (args.options.title) {
+                this.warn(logger, `Option 'title' is deprecated. Please use 'listTitle' instead.`);
             }
-        })()
-            .then((res) => {
-            formDigestValue = args.options.camlQuery ? res.FormDigestValue : '';
-            if (args.options.pageNumber && Number(args.options.pageNumber) > 0) {
-                const rowLimit = `$top=${Number(args.options.pageSize) * Number(args.options.pageNumber)}`;
+            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 fieldsWithSlash = fieldsArray.filter(item => item.includes('/'));
+            const fieldsToExpand = fieldsWithSlash.map(e => e.split('/')[0]);
+            const expandFieldsArray = fieldsToExpand.filter((item, pos) => fieldsToExpand.indexOf(item) === pos);
+            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)}')`;
+            try {
+                if (args.options.camlQuery) {
+                    if (this.debug) {
+                        logger.logToStderr(`getting request digest for query request`);
+                    }
+                    const res = yield utils_1.spo.getRequestDigest(args.options.webUrl);
+                    formDigestValue = res.FormDigestValue;
+                }
+                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 fieldSelect = `?$select=Id&${rowLimit}&${filter}`;
+                    const requestOptions = {
+                        url: `${listRestUrl}/items${fieldSelect}`,
+                        headers: {
+                            'accept': 'application/json;odata=nometadata',
+                            'X-RequestDigest': formDigestValue
+                        },
+                        responseType: 'json'
+                    };
+                    res = yield request_1.default.get(requestOptions);
+                }
+                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 fieldSelect = `?$select=Id&${rowLimit}&${filter}`;
+                const fieldExpand = expandFieldsArray.length > 0 ? `&$expand=${expandFieldsArray.join(",")}` : ``;
+                const fieldSelect = fieldsArray.length > 0 ?
+                    `?$select=${encodeURIComponent(fieldsArray.join(","))}${fieldExpand}&${rowLimit}&${skipToken}&${filter}` :
+                    `?${rowLimit}&${skipToken}&${filter}`;
+                const requestBody = args.options.camlQuery ?
+                    {
+                        "query": {
+                            "ViewXml": args.options.camlQuery
+                        }
+                    }
+                    : ``;
                 const requestOptions = {
-                    url: `${listRestUrl}/items${fieldSelect}`,
+                    url: `${listRestUrl}/${args.options.camlQuery ? `GetItems` : `items${fieldSelect}`}`,
                     headers: {
                         'accept': 'application/json;odata=nometadata',
                         'X-RequestDigest': formDigestValue
                     },
-                    responseType: 'json'
+                    responseType: 'json',
+                    data: requestBody
                 };
-                return request_1.default.get(requestOptions);
+                const listItemInstances = args.options.camlQuery ? yield request_1.default.post(requestOptions) : yield request_1.default.get(requestOptions);
+                listItemInstances.value.forEach(v => delete v['ID']);
+                logger.log(listItemInstances.value);
             }
-            else {
-                return Promise.resolve();
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-        })
-            .then((res) => {
-            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 fieldExpand = expandFieldsArray.length > 0 ? `&$expand=${expandFieldsArray.join(",")}` : ``;
-            const fieldSelect = fieldsArray.length > 0 ?
-                `?$select=${encodeURIComponent(fieldsArray.join(","))}${fieldExpand}&${rowLimit}&${skipToken}&${filter}` :
-                `?${rowLimit}&${skipToken}&${filter}`;
-            const requestBody = args.options.camlQuery ?
-                {
-                    "query": {
-                        "ViewXml": args.options.camlQuery
-                    }
-                }
-                : ``;
-            const requestOptions = {
-                url: `${listRestUrl}/${args.options.camlQuery ? `GetItems` : `items${fieldSelect}`}`,
-                headers: {
-                    'accept': 'application/json;odata=nometadata',
-                    'X-RequestDigest': formDigestValue
-                },
-                responseType: 'json',
-                data: requestBody
-            };
-            return args.options.camlQuery ? request_1.default.post(requestOptions) : request_1.default.get(requestOptions);
-        })
-            .then((listItemInstances) => {
-            listItemInstances.value.forEach(v => delete v['ID']);
-            logger.log(listItemInstances.value);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+        });
     }
 }
 _SpoListItemListCommand_instances = new WeakSet(), _SpoListItemListCommand_initTelemetry = function _SpoListItemListCommand_initTelemetry() {