@pnp/cli-microsoft365 6.7.0-beta.f5f5666 → 6.8.0-beta.e41be56

package/README.md

@@ -31,7 +31,7 @@
     <img src="https://img.shields.io/npm/v/@pnp/cli-microsoft365/latest?style=flat-square"
       alt="npm @pnp/cli-microsoft365@latest" />
   </a>
-  
+
   <a href="https://www.npmjs.com/package/@pnp/cli-microsoft365">
     <img src="https://img.shields.io/npm/v/@pnp/cli-microsoft365/next?style=flat-square"
       alt="npm @pnp/cli-microsoft365@next" />
@@ -41,16 +41,16 @@
 <p align="center">CLI for Microsoft 365 helps you manage your Microsoft 365 tenant and SharePoint Framework projects.</p>
 
 <p align="center">
-  <a href="https://pnp.github.io/cli-microsoft365">Website</a> | 
+  <a href="https://pnp.github.io/cli-microsoft365">Website</a> |
   <a href="#features">Features</a> |
-  <a href="#install">Install</a> | 
-  <a href="#usage">Usage</a> | 
-  <a href="#build">Build</a> | 
+  <a href="#install">Install</a> |
+  <a href="#usage">Usage</a> |
+  <a href="#build">Build</a> |
   <a href="#contribute">Contribute</a>
 </p>
 <p align="center">
   <a href="#sharing-is-caring">Sharing is Caring</a> |
-  <a href="#code-of-conduct">Code of Conduct</a> | 
+  <a href="#code-of-conduct">Code of Conduct</a> |
   <a href="#disclaimer">Disclaimer</a>
 </p>
 
@@ -91,7 +91,7 @@
   - Device Code
   - Username and Password
 - Manage your SharePoint Framework projects
-  - Uprade your projects
+  - Upgrade your projects
   - Check your environment compatibility
 
 > Follow our [Twitter](https://twitter.com/climicrosoft365) account to keep yourself updated about new features, improvements, and bug fixes.
@@ -105,7 +105,7 @@ npm install -g @pnp/cli-microsoft365
 ```
 
 <details>
-  <summary>Install beta version  β</summary>
+  <summary>Install beta version β</summary>
 
   ```
   npm install -g @pnp/cli-microsoft365@next
@@ -140,7 +140,7 @@ npm install -g @pnp/cli-microsoft365
 
 ## Usage
 
-Use the `login` command to start the Device Code login flow to authenticate with your Microsoft 365 tenant. 
+Use the `login` command to start the Device Code login flow to authenticate with your Microsoft 365 tenant.
 
 ```sh
 m365 login

package/dist/Command.js

@@ -127,21 +127,70 @@ class Command {
             if (!optionsSets || optionsSets.length === 0) {
                 return true;
             }
+            let inquirer;
+            const shouldPrompt = Cli_1.Cli.getInstance().getSettingWithDefaultValue(settingsNames_1.settingsNames.prompt, false);
             const argsOptions = Object.keys(args.options);
-            for (const optionSet of optionsSets) {
-                if (optionSet.runsWhen === undefined || optionSet.runsWhen(args)) {
-                    const commonOptions = argsOptions.filter(opt => optionSet.options.includes(opt));
-                    if (commonOptions.length === 0) {
-                        return `Specify one of the following options: ${optionSet.options.map(opt => opt).join(', ')}.`;
+            for (const optionSet of optionsSets.sort(opt => opt.runsWhen ? 0 : 1)) {
+                if (optionSet.runsWhen && !optionSet.runsWhen(args)) {
+                    continue;
+                }
+                const commonOptions = argsOptions.filter(opt => optionSet.options.includes(opt));
+                if (commonOptions.length === 0) {
+                    if (!shouldPrompt) {
+                        return `Specify one of the following options: ${optionSet.options.join(', ')}.`;
                     }
-                    if (commonOptions.length > 1) {
-                        return `Specify one of the following options: ${optionSet.options.map(opt => opt).join(', ')}, but not multiple.`;
+                    yield this.promptForOptionSetNameAndValue(args, optionSet, inquirer);
+                }
+                if (commonOptions.length > 1) {
+                    if (!shouldPrompt) {
+                        return `Specify one of the following options: ${optionSet.options.join(', ')}, but not multiple.`;
                     }
+                    yield this.promptForSpecificOption(args, commonOptions, inquirer);
                 }
             }
             return true;
         });
     }
+    promptForOptionSetNameAndValue(args, optionSet, inquirer) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!inquirer) {
+                inquirer = require('inquirer');
+            }
+            Cli_1.Cli.log(`Please specify one of the following options:`);
+            const resultOptionName = yield inquirer
+                .prompt({
+                type: 'list',
+                name: 'missingRequiredOptionName',
+                message: `Option to use:`,
+                choices: optionSet.options
+            });
+            const missingRequiredOptionName = resultOptionName.missingRequiredOptionName;
+            const resultOptionValue = yield inquirer
+                .prompt({
+                name: 'missingRequiredOptionValue',
+                message: `Value for '${missingRequiredOptionName}':`
+            });
+            args.options[missingRequiredOptionName] = resultOptionValue.missingRequiredOptionValue;
+            Cli_1.Cli.log();
+        });
+    }
+    promptForSpecificOption(args, commonOptions, inquirer) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!inquirer) {
+                inquirer = require('inquirer');
+            }
+            Cli_1.Cli.log(`Multiple options for an option set specified. Please specify the correct option that you wish to use.`);
+            const requiredOptionNameResult = yield inquirer
+                .prompt({
+                type: 'list',
+                name: 'missingRequiredOptionName',
+                message: `Option to use:`,
+                choices: commonOptions
+            });
+            commonOptions.filter(y => y !== requiredOptionNameResult.missingRequiredOptionName).map(optionName => args.options[optionName] = undefined);
+            Cli_1.Cli.log();
+        });
+    }
     validateOutput(args) {
         return __awaiter(this, void 0, void 0, function* () {
             if (args.options.output &&

package/dist/m365/flow/commands/run/run-get.js

@@ -13,10 +13,11 @@ 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 _FlowRunGetCommand_instances, _FlowRunGetCommand_initOptions;
+var _FlowRunGetCommand_instances, _FlowRunGetCommand_initOptions, _FlowRunGetCommand_initValidators, _FlowRunGetCommand_initTelemetry;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
+const validation_1 = require("../../../../utils/validation");
 const AzmgmtCommand_1 = require("../../../base/AzmgmtCommand");
 const commands_1 = require("../../commands");
 class FlowRunGetCommand extends AzmgmtCommand_1.default {
@@ -32,7 +33,9 @@ class FlowRunGetCommand extends AzmgmtCommand_1.default {
     constructor() {
         super();
         _FlowRunGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _FlowRunGetCommand_instances, "m", _FlowRunGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _FlowRunGetCommand_instances, "m", _FlowRunGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _FlowRunGetCommand_instances, "m", _FlowRunGetCommand_initValidators).call(this);
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -52,6 +55,18 @@ class FlowRunGetCommand extends AzmgmtCommand_1.default {
                 res.endTime = res.properties.endTime || '';
                 res.status = res.properties.status;
                 res.triggerName = res.properties.trigger.name;
+                if (args.options.includeTriggerInformation && res.properties.trigger.outputsLink) {
+                    const triggerInformationOptions = {
+                        url: res.properties.trigger.outputsLink.uri,
+                        headers: {
+                            accept: 'application/json',
+                            'x-anonymous': true
+                        },
+                        responseType: 'json'
+                    };
+                    const triggerInformationResponse = yield request_1.default.get(triggerInformationOptions);
+                    res.triggerInformation = triggerInformationResponse.body;
+                }
                 logger.log(res);
             }
             catch (err) {
@@ -67,6 +82,21 @@ _FlowRunGetCommand_instances = new WeakSet(), _FlowRunGetCommand_initOptions = f
         option: '-f, --flowName <flowName>'
     }, {
         option: '-e, --environmentName <environmentName>'
+    }, {
+        option: '--includeTriggerInformation'
+    });
+}, _FlowRunGetCommand_initValidators = function _FlowRunGetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (!validation_1.validation.isValidGuid(args.options.flowName)) {
+            return `${args.options.flowName} is not a valid GUID`;
+        }
+        return true;
+    }));
+}, _FlowRunGetCommand_initTelemetry = function _FlowRunGetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            includeTriggerInformation: !!args.options.includeTriggerInformation
+        });
     });
 };
 module.exports = new FlowRunGetCommand();

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