@pnp/cli-microsoft365 6.7.0-beta.60f2469 → 6.7.0-beta.7321771

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

@@ -17,6 +17,7 @@ var _SpoFileListCommand_instances, _SpoFileListCommand_initTelemetry, _SpoFileLi
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 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");
@@ -37,53 +38,123 @@ class SpoFileListCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {
-                logger.logToStderr(`Retrieving all files in folder ${args.options.folder} at site ${args.options.webUrl}...`);
+                logger.logToStderr(`Retrieving all files in folder '${args.options.folder}' at site '${args.options.webUrl}'${args.options.recursive ? ' (recursive)' : ''}...`);
             }
             try {
-                const files = yield this.getFiles(args.options.folder, args);
-                logger.log(files.value);
+                const fieldProperties = this.formatSelectProperties(args.options.fields, args.options.output);
+                const allFiles = [];
+                const allFolders = args.options.recursive
+                    ? [...yield this.getFolders(args.options.folder, args, logger), args.options.folder]
+                    : [args.options.folder];
+                for (const folder of allFolders) {
+                    const files = yield this.getFiles(folder, fieldProperties, args, logger);
+                    files.forEach((file) => allFiles.push(file));
+                }
+                // Clean ListItemAllFields.ID property from the output if included
+                // Reason: It causes a casing conflict with 'Id' when parsing JSON in PowerShell
+                if (fieldProperties.selectProperties.some(p => p.toLowerCase().indexOf('listitemallfields') > -1)) {
+                    allFiles.filter(file => { var _a; return ((_a = file.ListItemAllFields) === null || _a === void 0 ? void 0 : _a.ID) !== undefined; }).forEach(file => delete file.ListItemAllFields['ID']);
+                }
+                logger.log(allFiles);
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);
             }
         });
     }
-    // Gets files from a folder recursively.
-    getFiles(folderUrl, args, files = { value: [] }) {
-        // If --recursive option is specified, retrieve both Files and Folder details, otherwise only Files.
-        const expandParameters = args.options.recursive ? 'Files,Folders' : 'Files';
-        let requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(folderUrl)}')?$expand=${expandParameters}`;
-        if (args.options.output !== 'json') {
-            requestUrl += '&$select=Files/UniqueId,Files/Name,Files/ServerRelativeUrl';
-        }
-        const requestOptions = {
-            url: requestUrl,
-            method: 'GET',
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then((filesAndFoldersResult) => {
-            filesAndFoldersResult.Files.forEach((file) => files.value.push(file));
-            // If the request is --recursive, call this method for other folders.
-            if (args.options.recursive &&
-                filesAndFoldersResult.Folders !== undefined &&
-                filesAndFoldersResult.Folders.length !== 0) {
-                return Promise.all(filesAndFoldersResult.Folders.map((folder) => this.getFiles(folder.ServerRelativeUrl, args, files)));
+    getFiles(folderUrl, fieldProperties, args, logger, skip = 0) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                const page = Math.ceil(skip / SpoFileListCommand.pageSize) + 1;
+                logger.logToStderr(`Retrieving files in folder '${folderUrl}'${page > 1 ? ', page ' + page : ''}...`);
+            }
+            const allFiles = [];
+            const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, folderUrl);
+            const requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl(@url)/Files?@url='${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}'`;
+            const queryParams = [`$skip=${skip}`, `$top=${SpoFileListCommand.pageSize}`];
+            if (fieldProperties.expandProperties.length > 0) {
+                queryParams.push(`$expand=${fieldProperties.expandProperties.join(',')}`);
+            }
+            if (fieldProperties.selectProperties.length > 0) {
+                queryParams.push(`$select=${fieldProperties.selectProperties.join(',')}`);
             }
-            else {
-                return;
+            if (args.options.filter) {
+                queryParams.push(`$filter=${args.options.filter}`);
             }
-        }).then(() => files);
+            const requestOptions = {
+                url: `${requestUrl}&${queryParams.join('&')}`,
+                method: 'GET',
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            const response = yield request_1.default.get(requestOptions);
+            response.value.forEach(file => allFiles.push(file));
+            if (response.value.length === SpoFileListCommand.pageSize) {
+                const files = yield this.getFiles(folderUrl, fieldProperties, args, logger, skip + SpoFileListCommand.pageSize);
+                files.forEach(file => allFiles.push(file));
+            }
+            return allFiles;
+        });
+    }
+    getFolders(folderUrl, args, logger, skip = 0) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                const page = Math.ceil(skip / SpoFileListCommand.pageSize) + 1;
+                logger.logToStderr(`Retrieving folders in folder '${folderUrl}'${page > 1 ? ', page ' + page : ''}...`);
+            }
+            const allFolders = [];
+            const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, folderUrl);
+            const requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl(@url)/Folders?@url='${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}'`;
+            const requestOptions = {
+                url: `${requestUrl}&$skip=${skip}&$top=${SpoFileListCommand.pageSize}&$select=ServerRelativeUrl`,
+                method: 'GET',
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            const response = yield request_1.default.get(requestOptions);
+            for (const folder of response.value) {
+                allFolders.push(folder.ServerRelativeUrl);
+                const subfolders = yield this.getFolders(folder.ServerRelativeUrl, args, logger);
+                subfolders.forEach(folder => allFolders.push(folder));
+            }
+            if (response.value.length === SpoFileListCommand.pageSize) {
+                const folders = yield this.getFolders(folderUrl, args, logger, skip + SpoFileListCommand.pageSize);
+                folders.forEach(folder => allFolders.push(folder));
+            }
+            return allFolders;
+        });
+    }
+    formatSelectProperties(fields, output) {
+        let selectProperties = [];
+        const expandProperties = [];
+        if (output === 'text' && !fields) {
+            selectProperties = ['UniqueId', 'Name', 'ServerRelativeUrl'];
+        }
+        if (fields) {
+            fields.split(',').forEach((field) => {
+                const subparts = field.trim().split('/');
+                if (subparts.length > 1) {
+                    expandProperties.push(subparts[0]);
+                }
+                selectProperties.push(field.trim());
+            });
+        }
+        return {
+            selectProperties: [...new Set(selectProperties)],
+            expandProperties: [...new Set(expandProperties)]
+        };
     }
 }
 _SpoFileListCommand_instances = new WeakSet(), _SpoFileListCommand_initTelemetry = function _SpoFileListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            recursive: args.options.recursive
+            recursive: args.options.recursive,
+            fields: typeof args.options.fields !== 'undefined',
+            filter: typeof args.options.filter !== 'undefined'
         });
     });
 }, _SpoFileListCommand_initOptions = function _SpoFileListCommand_initOptions() {
@@ -91,11 +162,16 @@ _SpoFileListCommand_instances = new WeakSet(), _SpoFileListCommand_initTelemetry
         option: '-u, --webUrl <webUrl>'
     }, {
         option: '-f, --folder <folder>'
+    }, {
+        option: '--fields [fields]'
+    }, {
+        option: '--filter [filter]'
     }, {
         option: '-r, --recursive'
     });
 }, _SpoFileListCommand_initValidators = function _SpoFileListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.webUrl); }));
 };
+SpoFileListCommand.pageSize = 5000;
 module.exports = new SpoFileListCommand();
 //# sourceMappingURL=file-list.js.map

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

@@ -15,8 +15,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoFolderListCommand_instances, _SpoFolderListCommand_initTelemetry, _SpoFolderListCommand_initOptions, _SpoFolderListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
-const odata_1 = require("../../../../utils/odata");
 const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
@@ -41,37 +41,89 @@ class SpoFolderListCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {
-                logger.logToStderr(`Retrieving folders from site ${args.options.webUrl} parent folder ${args.options.parentFolderUrl} ${args.options.recursive ? '(recursive)' : ''}...`);
+                logger.logToStderr(`Retrieving all folders in folder '${args.options.parentFolderUrl}' at site '${args.options.webUrl}'${args.options.recursive ? ' (recursive)' : ''}...`);
             }
             try {
-                const resp = yield this.getFolderList(args.options.webUrl, args.options.parentFolderUrl, args.options.recursive);
-                logger.log(resp);
+                const fieldProperties = this.formatSelectProperties(args.options.fields);
+                const allFiles = yield this.getFolders(args.options.parentFolderUrl, fieldProperties, args, logger);
+                // Clean ListItemAllFields.ID property from the output if included
+                // Reason: It causes a casing conflict with 'Id' when parsing JSON in PowerShell
+                if (fieldProperties.selectProperties.some(p => p.toLowerCase().indexOf('listitemallfields') > -1)) {
+                    allFiles.filter(folder => { var _a; return ((_a = folder.ListItemAllFields) === null || _a === void 0 ? void 0 : _a.ID) !== undefined; }).forEach(folder => delete folder.ListItemAllFields['ID']);
+                }
+                logger.log(allFiles);
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);
             }
         });
     }
-    getFolderList(webUrl, parentFolderUrl, recursive, folders = []) {
+    getFolders(parentFolderUrl, fieldProperties, args, logger, skip = 0) {
         return __awaiter(this, void 0, void 0, function* () {
-            const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(webUrl, parentFolderUrl);
-            const resp = yield odata_1.odata.getAllItems(`${webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')/folders`);
-            if (resp.length > 0) {
-                for (const folder of resp) {
-                    folders.push(folder);
-                    if (recursive) {
-                        yield this.getFolderList(webUrl, folder.ServerRelativeUrl, recursive, folders);
-                    }
+            if (this.verbose) {
+                const page = Math.ceil(skip / SpoFolderListCommand.pageSize) + 1;
+                logger.logToStderr(`Retrieving folders in folder '${parentFolderUrl}'${page > 1 ? ', page ' + page : ''}...`);
+            }
+            const allFolders = [];
+            const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, parentFolderUrl);
+            const requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl(@url)/Folders?@url='${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}'`;
+            const queryParams = [`$skip=${skip}`, `$top=${SpoFolderListCommand.pageSize}`];
+            if (fieldProperties.expandProperties.length > 0) {
+                queryParams.push(`$expand=${fieldProperties.expandProperties.join(',')}`);
+            }
+            if (fieldProperties.selectProperties.length > 0) {
+                queryParams.push(`$select=${fieldProperties.selectProperties.join(',')}`);
+            }
+            if (args.options.filter) {
+                queryParams.push(`$filter=${args.options.filter}`);
+            }
+            const requestOptions = {
+                url: `${requestUrl}&${queryParams.join('&')}`,
+                method: 'GET',
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            const response = yield request_1.default.get(requestOptions);
+            for (const folder of response.value) {
+                allFolders.push(folder);
+                if (args.options.recursive) {
+                    const subFolders = yield this.getFolders(folder.ServerRelativeUrl, fieldProperties, args, logger);
+                    subFolders.forEach(subFolder => allFolders.push(subFolder));
                 }
             }
-            return folders;
+            if (response.value.length === SpoFolderListCommand.pageSize) {
+                const folders = yield this.getFolders(parentFolderUrl, fieldProperties, args, logger, skip + SpoFolderListCommand.pageSize);
+                folders.forEach(folder => allFolders.push(folder));
+            }
+            return allFolders;
         });
     }
+    formatSelectProperties(fields) {
+        const selectProperties = [];
+        const expandProperties = [];
+        if (fields) {
+            fields.split(',').forEach((field) => {
+                const subparts = field.trim().split('/');
+                if (subparts.length > 1) {
+                    expandProperties.push(subparts[0]);
+                }
+                selectProperties.push(field.trim());
+            });
+        }
+        return {
+            selectProperties: [...new Set(selectProperties)],
+            expandProperties: [...new Set(expandProperties)]
+        };
+    }
 }
 _SpoFolderListCommand_instances = new WeakSet(), _SpoFolderListCommand_initTelemetry = function _SpoFolderListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            recursive: !!args.options.recursive
+            recursive: !!args.options.recursive,
+            fields: typeof args.options.fields !== 'undefined',
+            filter: typeof args.options.filter !== 'undefined'
         });
     });
 }, _SpoFolderListCommand_initOptions = function _SpoFolderListCommand_initOptions() {
@@ -80,10 +132,15 @@ _SpoFolderListCommand_instances = new WeakSet(), _SpoFolderListCommand_initTelem
     }, {
         option: '-p, --parentFolderUrl <parentFolderUrl>'
     }, {
-        option: '--recursive [recursive]'
+        option: '-f, --fields [fields]'
+    }, {
+        option: '--filter [filter]'
+    }, {
+        option: '-r, --recursive [recursive]'
     });
 }, _SpoFolderListCommand_initValidators = function _SpoFolderListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.webUrl); }));
 };
+SpoFolderListCommand.pageSize = 5000;
 module.exports = new SpoFolderListCommand();
 //# sourceMappingURL=folder-list.js.map

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

@@ -18,6 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
+const odata_1 = require("../../../../utils/odata");
 const spo_1 = require("../../../../utils/spo");
 const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
@@ -41,63 +42,94 @@ class SpoListItemListCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            let requestUrl = `${args.options.webUrl}/_api/web`;
+            let listApiUrl = `${args.options.webUrl}/_api/web`;
             if (args.options.listId) {
-                requestUrl += `/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`;
+                listApiUrl += `/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`;
             }
             else if (args.options.listTitle) {
-                requestUrl += `/lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
+                listApiUrl += `/lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
             }
             else if (args.options.listUrl) {
                 const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
-                requestUrl += `/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
-            }
-            let formDigestValue = '';
-            const fieldsArray = args.options.fields ? args.options.fields.split(",")
-                : (!args.options.output || Cli_1.Cli.shouldTrimOutput(args.options.output)) ? ["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);
+                listApiUrl += `/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
+            }
             try {
-                if (args.options.camlQuery) {
-                    if (this.debug) {
-                        logger.logToStderr(`getting request digest for query request`);
+                const listItems = args.options.camlQuery
+                    ? yield this.getItemsUsingCAMLQuery(logger, args.options, listApiUrl)
+                    : yield this.getItems(logger, args.options, listApiUrl);
+                listItems.forEach(v => delete v['ID']);
+                logger.log(listItems);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    getItems(logger, options, listApiUrl) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Getting list items`);
+            }
+            const queryParams = [];
+            const fieldsArray = options.fields ? options.fields.split(",")
+                : (!options.output || Cli_1.Cli.shouldTrimOutput(options.output)) ? ["Title", "Id"] : [];
+            const expandFieldsArray = this.getExpandFieldsArray(fieldsArray);
+            const skipTokenId = yield this.getLastItemIdForPage(logger, options, listApiUrl);
+            queryParams.push(`$top=${options.pageSize || 5000}`);
+            if (options.filter) {
+                queryParams.push(`$filter=${encodeURIComponent(options.filter)}`);
+            }
+            if (expandFieldsArray.length > 0) {
+                queryParams.push(`$expand=${expandFieldsArray.join(",")}`);
+            }
+            if (fieldsArray.length > 0) {
+                queryParams.push(`$select=${formatting_1.formatting.encodeQueryParameter(fieldsArray.join(","))}`);
+            }
+            if (skipTokenId !== undefined) {
+                queryParams.push(`$skiptoken=Paged=TRUE%26p_ID=${skipTokenId}`);
+            }
+            // If skiptoken is not found, then we are past the last page
+            if (options.pageNumber && Number(options.pageNumber) > 0 && skipTokenId === undefined) {
+                return [];
+            }
+            if (!options.pageSize) {
+                return yield odata_1.odata.getAllItems(`${listApiUrl}/items?${queryParams.join('&')}`);
+            }
+            else {
+                const requestOptions = {
+                    url: `${listApiUrl}/items?${queryParams.join('&')}`,
+                    headers: {
+                        'accept': 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                const listItemCollection = yield request_1.default.get(requestOptions);
+                return listItemCollection.value;
+            }
+        });
+    }
+    getItemsUsingCAMLQuery(logger, options, listApiUrl) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const formDigestValue = (yield spo_1.spo.getRequestDigest(options.webUrl)).FormDigestValue;
+            if (this.verbose) {
+                logger.logToStderr(`Getting list items using CAML query`);
+            }
+            const items = [];
+            let skipTokenId = undefined;
+            do {
+                const requestBody = {
+                    "query": {
+                        "ViewXml": options.camlQuery,
+                        "AllowIncrementalResults": true
                     }
-                    const res = yield spo_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: `${requestUrl}/items${fieldSelect}`,
-                        headers: {
-                            'accept': 'application/json;odata=nometadata',
-                            'X-RequestDigest': formDigestValue
-                        },
-                        responseType: 'json'
+                };
+                if (skipTokenId !== undefined) {
+                    requestBody.query.ListItemCollectionPosition = {
+                        "PagingInfo": `Paged=TRUE&p_ID=${skipTokenId}`
                     };
-                    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 fieldExpand = expandFieldsArray.length > 0 ? `&$expand=${expandFieldsArray.join(",")}` : ``;
-                const fieldSelect = fieldsArray.length > 0 ?
-                    `?$select=${formatting_1.formatting.encodeQueryParameter(fieldsArray.join(","))}${fieldExpand}&${rowLimit}&${skipToken}&${filter}` :
-                    `?${rowLimit}&${skipToken}&${filter}`;
-                const requestBody = args.options.camlQuery ?
-                    {
-                        "query": {
-                            "ViewXml": args.options.camlQuery
-                        }
-                    }
-                    : ``;
                 const requestOptions = {
-                    url: `${requestUrl}/${args.options.camlQuery ? `GetItems` : `items${fieldSelect}`}`,
+                    url: `${listApiUrl}/GetItems`,
                     headers: {
                         'accept': 'application/json;odata=nometadata',
                         'X-RequestDigest': formDigestValue
@@ -105,13 +137,39 @@ class SpoListItemListCommand extends SpoCommand_1.default {
                     responseType: 'json',
                     data: requestBody
                 };
-                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);
+                const listItemInstances = yield request_1.default.post(requestOptions);
+                skipTokenId = listItemInstances.value.length > 0 ? listItemInstances.value[listItemInstances.value.length - 1].Id : undefined;
+                items.push(...listItemInstances.value);
+            } while (skipTokenId !== undefined);
+            return items;
+        });
+    }
+    getExpandFieldsArray(fieldsArray) {
+        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);
+        return expandFieldsArray;
+    }
+    getLastItemIdForPage(logger, options, listApiUrl) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!options.pageNumber || Number(options.pageNumber) === 0) {
+                return undefined;
             }
-            catch (err) {
-                this.handleRejectedODataJsonPromise(err);
+            if (this.verbose) {
+                logger.logToStderr(`Getting skipToken Id for page ${options.pageNumber}`);
             }
+            const rowLimit = `$top=${Number(options.pageSize) * Number(options.pageNumber)}`;
+            const filter = options.filter ? `$filter=${encodeURIComponent(options.filter)}` : ``;
+            const requestOptions = {
+                url: `${listApiUrl}/items?$select=Id&${rowLimit}&${filter}`,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            const response = yield request_1.default.get(requestOptions);
+            return (_a = response.value[response.value.length - 1]) === null || _a === void 0 ? void 0 : _a.Id;
         });
     }
 }
@@ -155,16 +213,16 @@ _SpoListItemListCommand_instances = new WeakSet(), _SpoListItemListCommand_initT
             return isValidSharePointUrl;
         }
         if (args.options.camlQuery && args.options.fields) {
-            return `Specify camlQuery or fields but not both`;
+            return `You cannot use the fields-option when specifying a camlQuery`;
         }
         if (args.options.camlQuery && args.options.pageSize) {
-            return `Specify camlQuery or pageSize but not both`;
+            return `You cannot use the pageSize-option when specifying a camlQuery`;
         }
         if (args.options.camlQuery && args.options.pageNumber) {
-            return `Specify camlQuery or pageNumber but not both`;
+            return `You cannot use the pageNumber-option when specifying a camlQuery`;
         }
         if (args.options.pageSize && isNaN(Number(args.options.pageSize))) {
-            return `pageSize must be numeric`;
+            return `pageSize ${args.options.pageSize} must be numeric`;
         }
         if (args.options.pageNumber && !args.options.pageSize) {
             return `pageSize must be specified if pageNumber is specified`;

package/dist/request.js

@@ -123,6 +123,7 @@ class Request {
         if (!this._logger) {
             return Promise.reject('Logger not set on the request object');
         }
+        this.updateRequestForCloudType(options, Auth_1.default.service.cloudType);
         return new Promise((_resolve, _reject) => {
             (() => {
                 if (options.headers && options.headers['x-anonymous']) {
@@ -181,6 +182,12 @@ class Request {
             });
         });
     }
+    updateRequestForCloudType(options, cloudType) {
+        const url = new URL(options.url);
+        const hostname = `${url.protocol}//${url.hostname}`;
+        const cloudUrl = Auth_1.Auth.getEndpointForResource(hostname, cloudType);
+        options.url = options.url.replace(hostname, cloudUrl);
+    }
 }
 exports.default = new Request();
 //# sourceMappingURL=request.js.map

package/dist/utils/misc.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.misc = void 0;
+exports.misc = {
+    getEnums(en) {
+        return Object
+            .keys(en)
+            .filter(k => isNaN(parseInt(k)));
+    }
+};
+//# sourceMappingURL=misc.js.map