@pnp/cli-microsoft365 6.7.0-beta.87c47df → 6.7.0-beta.eb19618

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/applicationcustomizer/applicationcustomizer-get.js

@@ -0,0 +1,144 @@
+"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 _SpoApplicationCustomizerGetCommand_instances, _SpoApplicationCustomizerGetCommand_initTelemetry, _SpoApplicationCustomizerGetCommand_initOptions, _SpoApplicationCustomizerGetCommand_initValidators, _SpoApplicationCustomizerGetCommand_initOptionSets;
+Object.defineProperty(exports, "__esModule", { value: true });
+const formatting_1 = require("../../../../utils/formatting");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+class SpoApplicationCustomizerGetCommand extends SpoCommand_1.default {
+    get name() {
+        return commands_1.default.APPLICATIONCUSTOMIZER_GET;
+    }
+    get description() {
+        return 'Get an application customizer that is added to a site.';
+    }
+    constructor() {
+        super();
+        _SpoApplicationCustomizerGetCommand_instances.add(this);
+        this.allowedScopes = ['All', 'Site', 'Web'];
+        __classPrivateFieldGet(this, _SpoApplicationCustomizerGetCommand_instances, "m", _SpoApplicationCustomizerGetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoApplicationCustomizerGetCommand_instances, "m", _SpoApplicationCustomizerGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoApplicationCustomizerGetCommand_instances, "m", _SpoApplicationCustomizerGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoApplicationCustomizerGetCommand_instances, "m", _SpoApplicationCustomizerGetCommand_initOptionSets).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const customAction = yield this.getCustomAction(args.options);
+                if (customAction) {
+                    logger.log({
+                        ClientSideComponentId: customAction.ClientSideComponentId,
+                        ClientSideComponentProperties: customAction.ClientSideComponentProperties,
+                        CommandUIExtension: customAction.CommandUIExtension,
+                        Description: customAction.Description,
+                        Group: customAction.Group,
+                        Id: customAction.Id,
+                        ImageUrl: customAction.ImageUrl,
+                        Location: customAction.Location,
+                        Name: customAction.Name,
+                        RegistrationId: customAction.RegistrationId,
+                        RegistrationType: customAction.RegistrationType,
+                        Rights: JSON.stringify(customAction.Rights),
+                        Scope: this.humanizeScope(customAction.Scope),
+                        ScriptBlock: customAction.ScriptBlock,
+                        ScriptSrc: customAction.ScriptSrc,
+                        Sequence: customAction.Sequence,
+                        Title: customAction.Title,
+                        Url: customAction.Url,
+                        VersionOfUserCustomAction: customAction.VersionOfUserCustomAction
+                    });
+                }
+            }
+            catch (err) {
+                this.handleRejectedPromise(err);
+            }
+        });
+    }
+    getCustomAction(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (options.id) {
+                const customAction = yield spo_1.spo.getCustomActionById(options.webUrl, options.id, options.scope);
+                if (!customAction || (customAction && customAction.Location !== 'ClientSideExtension.ApplicationCustomizer')) {
+                    throw `No application customizer with id '${options.id}' found`;
+                }
+                return customAction;
+            }
+            const filter = options.title ? `Title eq '${formatting_1.formatting.encodeQueryParameter(options.title)}'` : `ClientSideComponentId eq guid'${formatting_1.formatting.encodeQueryParameter(options.clientSideComponentId)}'`;
+            const customActions = yield spo_1.spo.getCustomActions(options.webUrl, options.scope, `${filter} and Location eq 'ClientSideExtension.ApplicationCustomizer'`);
+            if (customActions.length === 1) {
+                return customActions[0];
+            }
+            const errorMessage = options.title ? `title '${options.title}'` : `Client Side Component Id '${options.clientSideComponentId}'`;
+            if (customActions.length === 0) {
+                throw `No application customizer with ${errorMessage} found`;
+            }
+            else {
+                throw `Multiple application customizers with ${errorMessage} found. Please disambiguate using IDs: ${customActions.map(a => a.Id).join(', ')}`;
+            }
+        });
+    }
+    humanizeScope(scope) {
+        switch (scope) {
+            case 2:
+                return "Site";
+            case 3:
+                return "Web";
+        }
+        return `${scope}`;
+    }
+}
+_SpoApplicationCustomizerGetCommand_instances = new WeakSet(), _SpoApplicationCustomizerGetCommand_initTelemetry = function _SpoApplicationCustomizerGetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            title: typeof args.options.title !== 'undefined',
+            id: typeof args.options.id !== 'undefined',
+            clientSideComponentId: typeof args.options.clientSideComponentId !== 'undefined',
+            scope: typeof args.options.scope !== 'undefined'
+        });
+    });
+}, _SpoApplicationCustomizerGetCommand_initOptions = function _SpoApplicationCustomizerGetCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-t, --title [title]'
+    }, {
+        option: '-i, --id [id]'
+    }, {
+        option: '-c, --clientSideComponentId  [clientSideComponentId]'
+    }, {
+        option: '-s, --scope [scope]',
+        autocomplete: this.allowedScopes
+    });
+}, _SpoApplicationCustomizerGetCommand_initValidators = function _SpoApplicationCustomizerGetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
+        }
+        if (args.options.clientSideComponentId && !validation_1.validation.isValidGuid(args.options.clientSideComponentId)) {
+            return `${args.options.clientSideComponentId} is not a valid GUID`;
+        }
+        if (args.options.scope && this.allowedScopes.indexOf(args.options.scope) === -1) {
+            return `'${args.options.scope}' is not a valid application customizer scope. Allowed values are: ${this.allowedScopes.join(',')}`;
+        }
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
+    }));
+}, _SpoApplicationCustomizerGetCommand_initOptionSets = function _SpoApplicationCustomizerGetCommand_initOptionSets() {
+    this.optionSets.push({ options: ['title', 'id', 'clientSideComponentId'] });
+};
+module.exports = new SpoApplicationCustomizerGetCommand();
+//# sourceMappingURL=applicationcustomizer-get.js.map

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

@@ -144,6 +144,9 @@ class SpoListAddCommand extends SpoCommand_1.default {
         if (options.direction) {
             requestBody.Direction = options.direction;
         }
+        if (options.disableCommenting !== undefined) {
+            requestBody.DisableCommenting = options.disableCommenting;
+        }
         if (options.disableGridEditing !== undefined) {
             requestBody.DisableGridEditing = options.disableGridEditing;
         }
@@ -377,6 +380,9 @@ _SpoListAddCommand_instances = new WeakSet(), _SpoListAddCommand_initTelemetry =
     }, {
         option: '--direction [direction]',
         autocomplete: ['NONE', 'LTR', 'RTL']
+    }, {
+        option: '--disableCommenting [disableCommenting]',
+        autocomplete: ['true', 'false']
     }, {
         option: '--disableGridEditing [disableGridEditing]',
         autocomplete: ['true', 'false']
@@ -585,6 +591,7 @@ SpoListAddCommand.booleanOptions = [
     'allowMultiResponses',
     'contentTypesEnabled',
     'crawlNonDefaultViews',
+    'disableCommenting',
     'disableGridEditing',
     'enableAssignToEmail',
     'enableAttachments',

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

@@ -146,6 +146,9 @@ class SpoListSetCommand extends SpoCommand_1.default {
         if (options.direction) {
             requestBody.Direction = options.direction;
         }
+        if (options.disableCommenting !== undefined) {
+            requestBody.DisableCommenting = options.disableCommenting;
+        }
         if (options.disableGridEditing !== undefined) {
             requestBody.DisableGridEditing = options.disableGridEditing;
         }
@@ -380,6 +383,9 @@ _SpoListSetCommand_instances = new WeakSet(), _SpoListSetCommand_initTelemetry =
     }, {
         option: '--direction [direction]',
         autocomplete: ['NONE', 'LTR', 'RTL']
+    }, {
+        option: '--disableCommenting [disableCommenting]',
+        autocomplete: ['true', 'false']
     }, {
         option: '--disableGridEditing [disableGridEditing]',
         autocomplete: ['true', 'false']
@@ -591,6 +597,7 @@ SpoListSetCommand.booleanOptions = [
     'allowMultiResponses',
     'contentTypesEnabled',
     'crawlNonDefaultViews',
+    'disableCommenting',
     'disableGridEditing',
     'enableAssignToEmail',
     'enableAttachments',

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/m365/spo/commands/site/site-recyclebinitem-clear.js

@@ -0,0 +1,115 @@
+"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 _SpoSiteRecycleBinItemClearCommand_instances, _SpoSiteRecycleBinItemClearCommand_initTelemetry, _SpoSiteRecycleBinItemClearCommand_initOptions, _SpoSiteRecycleBinItemClearCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
+const request_1 = require("../../../../request");
+const validation_1 = require("../../../../utils/validation");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+class SpoSiteRecycleBinItemClearCommand extends SpoCommand_1.default {
+    get name() {
+        return commands_1.default.SITE_RECYCLEBINITEM_CLEAR;
+    }
+    get description() {
+        return 'Permanently removes all items in a site recycle bin';
+    }
+    constructor() {
+        super();
+        _SpoSiteRecycleBinItemClearCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoSiteRecycleBinItemClearCommand_instances, "m", _SpoSiteRecycleBinItemClearCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoSiteRecycleBinItemClearCommand_instances, "m", _SpoSiteRecycleBinItemClearCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoSiteRecycleBinItemClearCommand_instances, "m", _SpoSiteRecycleBinItemClearCommand_initValidators).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.confirm) {
+                yield this.clearRecycleBin(args, logger);
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to clear the recycle bin of site ${args.options.siteUrl}?`
+                });
+                if (result.continue) {
+                    yield this.clearRecycleBin(args, logger);
+                }
+            }
+        });
+    }
+    clearRecycleBin(args, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                if (this.verbose) {
+                    logger.logToStderr(`Permanently removing all items in recycle bin of site ${args.options.siteUrl}...`);
+                }
+                const requestOptions = {
+                    headers: {
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                if (args.options.secondary) {
+                    if (this.verbose) {
+                        logger.logToStderr('Removing all items from the second-stage recycle bin');
+                    }
+                    requestOptions.url = `${args.options.siteUrl}/_api/site/RecycleBin/DeleteAllSecondStageItems`;
+                }
+                else {
+                    if (this.verbose) {
+                        logger.logToStderr('Removing all items from the first-stage recycle bin');
+                    }
+                    requestOptions.url = `${args.options.siteUrl}/_api/web/RecycleBin/DeleteAll`;
+                }
+                const result = yield request_1.default.post(requestOptions);
+                if (result['odata.null'] !== true) {
+                    throw result;
+                }
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+}
+_SpoSiteRecycleBinItemClearCommand_instances = new WeakSet(), _SpoSiteRecycleBinItemClearCommand_initTelemetry = function _SpoSiteRecycleBinItemClearCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            secondary: !!args.options.secondary,
+            confirm: !!args.options.confirm
+        });
+    });
+}, _SpoSiteRecycleBinItemClearCommand_initOptions = function _SpoSiteRecycleBinItemClearCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --siteUrl <siteUrl>'
+    }, {
+        option: '--secondary'
+    }, {
+        option: '--confirm'
+    });
+}, _SpoSiteRecycleBinItemClearCommand_initValidators = function _SpoSiteRecycleBinItemClearCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.siteUrl);
+        if (isValidSharePointUrl !== true) {
+            return isValidSharePointUrl;
+        }
+        return true;
+    }));
+};
+module.exports = new SpoSiteRecycleBinItemClearCommand();
+//# sourceMappingURL=site-recyclebinitem-clear.js.map

package/dist/m365/spo/commands.js

@@ -14,6 +14,7 @@ exports.default = {
     APP_UNINSTALL: `${prefix} app uninstall`,
     APP_UPGRADE: `${prefix} app upgrade`,
     APPLICATIONCUSTOMIZER_ADD: `${prefix} applicationcustomizer add`,
+    APPLICATIONCUSTOMIZER_GET: `${prefix} applicationcustomizer get`,
     APPLICATIONCUSTOMIZER_LIST: `${prefix} applicationcustomizer list`,
     APPPAGE_ADD: `${prefix} apppage add`,
     APPPAGE_SET: `${prefix} apppage set`,
@@ -246,6 +247,7 @@ exports.default = {
     SITE_HUBSITE_THEME_SYNC: `${prefix} site hubsite theme sync`,
     SITE_LIST: `${prefix} site list`,
     SITE_INPLACERECORDSMANAGEMENT_SET: `${prefix} site inplacerecordsmanagement set`,
+    SITE_RECYCLEBINITEM_CLEAR: `${prefix} site recyclebinitem clear`,
     SITE_RECYCLEBINITEM_LIST: `${prefix} site recyclebinitem list`,
     SITE_RECYCLEBINITEM_RESTORE: `${prefix} site recyclebinitem restore`,
     SITE_REMOVE: `${prefix} site remove`,

package/dist/m365/teams/commands/team/team-add.js

@@ -99,7 +99,7 @@ class TeamsTeamAddCommand extends GraphCommand_1.default {
                     }
                 }));
                 let output;
-                if (teamsAsyncOperation.status !== TeamsAsyncOperationStatus.Succeeded) {
+                if (!args.options.wait) {
                     output = teamsAsyncOperation;
                 }
                 else {
@@ -139,7 +139,7 @@ _TeamsTeamAddCommand_instances = new WeakSet(), _TeamsTeamAddCommand_initTelemet
             name: typeof args.options.name !== 'undefined',
             description: typeof args.options.description !== 'undefined',
             template: typeof args.options.template !== 'undefined',
-            wait: args.options.wait
+            wait: !!args.options.wait
         });
     });
 }, _TeamsTeamAddCommand_initOptions = function _TeamsTeamAddCommand_initOptions() {

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