@pnp/cli-microsoft365 6.3.0-beta.a991329 → 6.3.0-beta.e46ffee

package/dist/Command.js

@@ -481,18 +481,7 @@ class Command {
                 if (!l) {
                     return;
                 }
-                const title = this.getLogItemTitle(l);
-                const id = this.getLogItemId(l);
-                if (title && id) {
-                    output.push(`## ${title} (${id})`);
-                }
-                else if (title) {
-                    output.push(`## ${title}`);
-                }
-                else if (id) {
-                    output.push(`## ${id}`);
-                }
-                output.push(os.EOL, os.EOL, `Property | Value`, os.EOL, `---------|-------`, os.EOL);
+                output.push(`## ${this.getLogItemTitle(l)} (${this.getLogItemId(l)})`, os.EOL, os.EOL, `Property | Value`, os.EOL, `---------|-------`, os.EOL);
                 output.push(Object.keys(l).map(k => {
                     const value = l[k];
                     let stringValue = value;

package/dist/cli/Cli.js

@@ -458,7 +458,7 @@ class Cli {
         // data so that returned objects contain only default properties specified
         // on the current command. If there is no current command or the
         // command doesn't specify default properties, return original data
-        if (this.shouldTrimOutput(options.output)) {
+        if (options.output === 'text' || options.output === 'csv') {
             const cli = Cli.getInstance();
             const currentCommand = cli.commandToExecute;
             if (arrayType === 'object' &&
@@ -753,9 +753,6 @@ class Cli {
             }
         });
     }
-    static shouldTrimOutput(output) {
-        return output === 'text' || output === 'csv';
-    }
 }
 exports.Cli = Cli;
 Cli.defaultHelpMode = 'full';

package/dist/m365/aad/commands/group/group-list.js

@@ -15,7 +15,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _AadGroupListCommand_instances, _AadGroupListCommand_initTelemetry, _AadGroupListCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
-const Cli_1 = require("../../../../cli/Cli");
 const odata_1 = require("../../../../utils/odata");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -40,7 +39,7 @@ class AadGroupListCommand extends GraphCommand_1.default {
             const endpoint = args.options.deleted ? 'directory/deletedItems/microsoft.graph.group' : 'groups';
             try {
                 const groups = yield odata_1.odata.getAllItems(`${this.resource}/v1.0/${endpoint}`);
-                if (Cli_1.Cli.shouldTrimOutput(args.options.output)) {
+                if (args.options.output === 'text') {
                     groups.forEach((group) => {
                         if (group.groupTypes && group.groupTypes.length > 0 && group.groupTypes[0] === 'Unified') {
                             group.groupType = 'Microsoft 365';

package/dist/m365/graph/commands/changelog/changelog-list.js

@@ -21,7 +21,6 @@ const AnonymousCommand_1 = require("../../../base/AnonymousCommand");
 const commands_1 = require("../../commands");
 const request_1 = require("../../../../request");
 const xmldom_1 = require("@xmldom/xmldom");
-const Cli_1 = require("../../../../cli/Cli");
 class GraphChangelogListCommand extends AnonymousCommand_1.default {
     get name() {
         return commands_1.default.CHANGELOG_LIST;
@@ -107,14 +106,14 @@ class GraphChangelogListCommand extends AnonymousCommand_1.default {
             items: []
         };
         Array.from(xmlDoc.getElementsByTagName('item')).forEach((item) => {
-            const description = Cli_1.Cli.shouldTrimOutput(args.options.output) ?
+            const description = args.options.output === 'text' ?
                 md_1.md.md2plain(item.getElementsByTagName('description').item(0).textContent, '') :
                 item.getElementsByTagName('description').item(0).textContent;
             changelog.items.push({
                 guid: item.getElementsByTagName('guid').item(0).textContent,
                 category: item.getElementsByTagName('category').item(1).textContent,
                 title: item.getElementsByTagName('title').item(0).textContent,
-                description: Cli_1.Cli.shouldTrimOutput(args.options.output) ?
+                description: args.options.output === 'text' ?
                     description.length > 50 ? `${description.substring(0, 47)}...` : description :
                     description,
                 pubDate: new Date(item.getElementsByTagName('pubDate').item(0).textContent)

package/dist/m365/onenote/commands/notebook/notebook-list.js

@@ -13,14 +13,14 @@ 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 _OneNoteNotebookListCommand_instances, _OneNoteNotebookListCommand_initTelemetry, _OneNoteNotebookListCommand_initOptions, _OneNoteNotebookListCommand_initValidators, _OneNoteNotebookListCommand_initOptionSets;
+var _OneNoteNotebookListCommand_instances, _OneNoteNotebookListCommand_initTelemetry, _OneNoteNotebookListCommand_initOptions, _OneNoteNotebookListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const request_1 = require("../../../../request");
 const odata_1 = require("../../../../utils/odata");
 const validation_1 = require("../../../../utils/validation");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
+const spo_1 = require("../../../../utils/spo");
 class OneNoteNotebookListCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.NOTEBOOK_LIST;
@@ -28,63 +28,61 @@ class OneNoteNotebookListCommand extends GraphCommand_1.default {
     get description() {
         return 'Retrieve a list of notebooks';
     }
-    defaultProperties() {
-        return ['createdDateTime', 'displayName', 'id'];
-    }
     constructor() {
         super();
         _OneNoteNotebookListCommand_instances.add(this);
         __classPrivateFieldGet(this, _OneNoteNotebookListCommand_instances, "m", _OneNoteNotebookListCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _OneNoteNotebookListCommand_instances, "m", _OneNoteNotebookListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _OneNoteNotebookListCommand_instances, "m", _OneNoteNotebookListCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _OneNoteNotebookListCommand_instances, "m", _OneNoteNotebookListCommand_initOptionSets).call(this);
     }
     getEndpointUrl(args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let endpoint = `${this.resource}/v1.0/`;
+        return new Promise((resolve, reject) => {
+            let endpoint = `${this.resource}/v1.0/me/onenote/notebooks`;
             if (args.options.userId) {
-                endpoint += `users/${args.options.userId}`;
+                endpoint = `${this.resource}/v1.0/users/${args.options.userId}/onenote/notebooks`;
+                return resolve(endpoint);
             }
             else if (args.options.userName) {
-                endpoint += `users/${args.options.userName}`;
+                endpoint = `${this.resource}/v1.0/users/${args.options.userName}/onenote/notebooks`;
+                return resolve(endpoint);
             }
             else if (args.options.groupId) {
-                endpoint += `groups/${args.options.groupId}`;
+                endpoint = `${this.resource}/v1.0/groups/${args.options.groupId}/onenote/notebooks`;
+                return resolve(endpoint);
             }
             else if (args.options.groupName) {
-                const groupId = yield this.getGroupId(args.options.groupName);
-                endpoint += `groups/${groupId}`;
+                this
+                    .getGroupId(args)
+                    .then((retrievedgroupId) => {
+                    endpoint = `${this.resource}/v1.0/groups/${retrievedgroupId}/onenote/notebooks`;
+                    return resolve(endpoint);
+                })
+                    .catch((err) => {
+                    reject(err);
+                });
             }
             else if (args.options.webUrl) {
-                const siteId = yield this.getSpoSiteId(args.options.webUrl);
-                endpoint += `sites/${siteId}`;
+                spo_1.spo.getSpoGraphSiteId(args.options.webUrl)
+                    .then((siteId) => {
+                    endpoint = `${this.resource}/v1.0/sites/${siteId}/onenote/notebooks`;
+                    return resolve(endpoint);
+                })
+                    .catch((err) => {
+                    reject(err);
+                });
             }
             else {
-                endpoint += 'me';
+                return resolve(endpoint);
             }
-            endpoint += '/onenote/notebooks';
-            return endpoint;
         });
     }
-    getGroupId(groupName) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const group = yield aadGroup_1.aadGroup.getGroupByDisplayName(groupName);
-            return group.id;
-        });
+    defaultProperties() {
+        return ['createdDateTime', 'displayName', 'id'];
     }
-    getSpoSiteId(webUrl) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const url = new URL(webUrl);
-            const requestOptions = {
-                url: `${this.resource}/v1.0/sites/${url.hostname}:${url.pathname}`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none'
-                },
-                responseType: 'json'
-            };
-            const site = yield request_1.default.get(requestOptions);
-            return site.id;
-        });
+    getGroupId(args) {
+        return aadGroup_1.aadGroup
+            .getGroupByDisplayName(args.options.groupName)
+            .then(group => group.id);
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -102,11 +100,7 @@ class OneNoteNotebookListCommand extends GraphCommand_1.default {
 _OneNoteNotebookListCommand_instances = new WeakSet(), _OneNoteNotebookListCommand_initTelemetry = function _OneNoteNotebookListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            userId: typeof args.options.userId !== 'undefined',
-            userName: typeof args.options.userName !== 'undefined',
-            groupId: typeof args.options.groupId !== 'undefined',
-            groupName: typeof args.options.groupName !== 'undefined',
-            webUrl: typeof args.options.webUrl !== 'undefined'
+            joined: args.options.joined
         });
     });
 }, _OneNoteNotebookListCommand_initOptions = function _OneNoteNotebookListCommand_initOptions() {
@@ -119,19 +113,14 @@ _OneNoteNotebookListCommand_instances = new WeakSet(), _OneNoteNotebookListComma
         if (args.options.groupId && !validation_1.validation.isValidGuid(args.options.groupId)) {
             return `${args.options.groupId} is not a valid GUID`;
         }
-        if (args.options.webUrl) {
-            return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
+        if (args.options.userId && args.options.userName) {
+            return 'Specify either userId or userName, but not both';
+        }
+        if (args.options.groupId && args.options.groupName) {
+            return 'Specify either groupId or groupName, but not both';
         }
         return true;
     }));
-}, _OneNoteNotebookListCommand_initOptionSets = function _OneNoteNotebookListCommand_initOptionSets() {
-    this.optionSets.push({
-        options: ['userId', 'userName', 'groupId', 'groupName', 'webUrl'],
-        runsWhen: (args) => {
-            const options = [args.options.userId, args.options.userName, args.options.groupId, args.options.groupName, args.options.webUrl];
-            return options.some(item => item !== undefined);
-        }
-    });
 };
 module.exports = new OneNoteNotebookListCommand();
 //# sourceMappingURL=notebook-list.js.map

package/dist/m365/planner/commands/task/task-checklistitem-add.js

@@ -16,7 +16,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _PlannerTaskChecklistItemAddCommand_instances, _PlannerTaskChecklistItemAddCommand_initTelemetry, _PlannerTaskChecklistItemAddCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
 const uuid_1 = require("uuid");
-const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
 const GraphCommand_1 = require("../../../base/GraphCommand");
@@ -62,7 +61,7 @@ class PlannerTaskChecklistItemAddCommand extends GraphCommand_1.default {
                     data: body
                 };
                 const result = yield request_1.default.patch(requestOptions);
-                if (!Cli_1.Cli.shouldTrimOutput(args.options.output)) {
+                if (args.options.output === 'json') {
                     logger.log(result.checklist);
                 }
                 else {

package/dist/m365/planner/commands/task/task-checklistitem-list.js

@@ -15,7 +15,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _PlannerTaskChecklistItemListCommand_instances, _PlannerTaskChecklistItemListCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
-const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
 const GraphCommand_1 = require("../../../base/GraphCommand");
@@ -46,7 +45,7 @@ class PlannerTaskChecklistItemListCommand extends GraphCommand_1.default {
             };
             try {
                 const res = yield request_1.default.get(requestOptions);
-                if (!args.options.output || !Cli_1.Cli.shouldTrimOutput(args.options.output)) {
+                if (!args.options.output || args.options.output === 'json') {
                     logger.log(res.checklist);
                 }
                 else {

package/dist/m365/pp/commands/solution/solution-get.js

@@ -15,7 +15,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _PpSolutionGetCommand_instances, _PpSolutionGetCommand_initTelemetry, _PpSolutionGetCommand_initOptions, _PpSolutionGetCommand_initOptionSets, _PpSolutionGetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const powerPlatform_1 = require("../../../../utils/powerPlatform");
 const validation_1 = require("../../../../utils/validation");
@@ -47,7 +46,7 @@ class PpSolutionGetCommand extends PowerPlatformCommand_1.default {
             try {
                 const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
                 const res = yield this.getSolution(dynamicsApiUrl, args.options);
-                if (!args.options.output || !Cli_1.Cli.shouldTrimOutput(args.options.output)) {
+                if (!args.options.output || args.options.output === 'json') {
                     logger.log(res);
                 }
                 else {

package/dist/m365/pp/commands/solution/solution-list.js

@@ -15,7 +15,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _PpSolutionListCommand_instances, _PpSolutionListCommand_initTelemetry, _PpSolutionListCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
-const Cli_1 = require("../../../../cli/Cli");
 const odata_1 = require("../../../../utils/odata");
 const powerPlatform_1 = require("../../../../utils/powerPlatform");
 const PowerPlatformCommand_1 = require("../../../base/PowerPlatformCommand");
@@ -45,7 +44,7 @@ class PpSolutionListCommand extends PowerPlatformCommand_1.default {
                 const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
                 const requestUrl = `${dynamicsApiUrl}/api/data/v9.0/solutions?$filter=isvisible eq true&$expand=publisherid($select=friendlyname)&$select=solutionid,uniquename,version,publisherid,installedon,solutionpackageversion,friendlyname,versionnumber&api-version=9.1`;
                 const res = yield odata_1.odata.getAllItems(requestUrl);
-                if (!args.options.output || !Cli_1.Cli.shouldTrimOutput(args.options.output)) {
+                if (!args.options.output || args.options.output === 'json') {
                     logger.log(res);
                 }
                 else {

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

@@ -17,7 +17,6 @@ var _SpoAppAddCommand_instances, _SpoAppAddCommand_initTelemetry, _SpoAppAddComm
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const path = require("path");
-const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const spo_1 = require("../../../../utils/spo");
 const validation_1 = require("../../../../utils/validation");
@@ -59,7 +58,7 @@ class SpoAppAddCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
                 };
                 const res = yield request_1.default.post(requestOptions);
                 const json = JSON.parse(res);
-                if (!Cli_1.Cli.shouldTrimOutput(args.options.output)) {
+                if (args.options.output === 'json') {
                     logger.log(json);
                 }
                 else {

package/dist/m365/spo/commands/file/file-sharinginfo-get.js

@@ -15,7 +15,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoFileSharingInfoGetCommand_instances, _SpoFileSharingInfoGetCommand_initTelemetry, _SpoFileSharingInfoGetCommand_initOptions, _SpoFileSharingInfoGetCommand_initValidators, _SpoFileSharingInfoGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
 const validation_1 = require("../../../../utils/validation");
@@ -61,7 +60,7 @@ class SpoFileSharingInfoGetCommand extends SpoCommand_1.default {
                 // typically, we don't do this, but in this case, we need to due to
                 // the complexity of the retrieved object and the fact that we can't
                 // use the generic way of simplifying the output
-                if (!Cli_1.Cli.shouldTrimOutput(args.options.output)) {
+                if (args.options.output === 'json') {
                     logger.log(res);
                 }
                 else {

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

@@ -15,7 +15,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoFileSharingLinkListCommand_instances, _SpoFileSharingLinkListCommand_initTelemetry, _SpoFileSharingLinkListCommand_initOptions, _SpoFileSharingLinkListCommand_initValidators, _SpoFileSharingLinkListCommand_initOptionSets;
 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");
@@ -52,7 +51,7 @@ class SpoFileSharingLinkListCommand extends SpoCommand_1.default {
                     url += ` and Link/Scope eq '${args.options.scope}'`;
                 }
                 const sharingLinks = yield odata_1.odata.getAllItems(url);
-                if (!args.options.output || !Cli_1.Cli.shouldTrimOutput(args.options.output)) {
+                if (!args.options.output || args.options.output === 'json' || args.options.output === 'md') {
                     logger.log(sharingLinks);
                 }
                 else {

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

@@ -15,7 +15,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoGroupListCommand_instances, _SpoGroupListCommand_initTelemetry, _SpoGroupListCommand_initOptions, _SpoGroupListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const odata_1 = require("../../../../utils/odata");
 const validation_1 = require("../../../../utils/validation");
@@ -74,7 +73,7 @@ class SpoGroupListCommand extends SpoCommand_1.default {
             };
             const groupProperties = yield request_1.default.get(requestOptions);
             logger.log(groupProperties);
-            if (!options.output || !Cli_1.Cli.shouldTrimOutput(options.output)) {
+            if (!options.output || options.output === 'json') {
                 logger.log(groupProperties);
             }
             else {

package/dist/m365/spo/commands/hubsite/hubsite-get.js

@@ -45,7 +45,7 @@ class SpoHubSiteGetCommand extends SpoCommand_1.default {
                 if (args.options.includeAssociatedSites && (args.options.output && args.options.output !== 'json')) {
                     throw 'includeAssociatedSites option is only allowed with json output mode';
                 }
-                if (args.options.includeAssociatedSites === true && args.options.output && !Cli_1.Cli.shouldTrimOutput(args.options.output)) {
+                if (args.options.includeAssociatedSites === true && args.options.output && args.options.output === 'json') {
                     const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
                     const associatedSitesCommandOutput = yield this.getAssociatedSites(spoAdminUrl, hubSite.SiteId, logger, args);
                     const associatedSites = JSON.parse(associatedSitesCommandOutput.stdout);

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

@@ -15,7 +15,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoListItemListCommand_instances, _SpoListItemListCommand_initTelemetry, _SpoListItemListCommand_initOptions, _SpoListItemListCommand_initValidators, _SpoListItemListCommand_initOptionSets, _SpoListItemListCommand_initTypes;
 Object.defineProperty(exports, "__esModule", { value: true });
-const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
 const spo_1 = require("../../../../utils/spo");
@@ -54,7 +53,7 @@ class SpoListItemListCommand extends SpoCommand_1.default {
             }
             let formDigestValue = '';
             const fieldsArray = args.options.fields ? args.options.fields.split(",")
-                : (!args.options.output || Cli_1.Cli.shouldTrimOutput(args.options.output)) ? ["Title", "Id"] : [];
+                : (!args.options.output || args.options.output === "text") ? ["Title", "Id"] : [];
             const fieldsWithSlash = fieldsArray.filter(item => item.includes('/'));
             const fieldsToExpand = fieldsWithSlash.map(e => e.split('/')[0]);
             const expandFieldsArray = fieldsToExpand.filter((item, pos) => fieldsToExpand.indexOf(item) === pos);

package/dist/m365/spo/commands/page/page-column-get.js

@@ -15,7 +15,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoPageColumnGetCommand_instances, _SpoPageColumnGetCommand_initOptions, _SpoPageColumnGetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const Cli_1 = require("../../../../cli/Cli");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -40,7 +39,7 @@ class SpoPageColumnGetCommand extends SpoCommand_1.default {
                 const sections = clientSidePage.sections
                     .filter(section => section.order === args.options.section);
                 if (sections.length) {
-                    const isJSONOutput = !Cli_1.Cli.shouldTrimOutput(args.options.output);
+                    const isJSONOutput = args.options.output === 'json';
                     const columns = sections[0].columns.filter(col => col.order === args.options.column);
                     if (columns.length) {
                         const column = Page_1.Page.getColumnsInformation(columns[0], isJSONOutput);

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

@@ -15,7 +15,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoPageColumnListCommand_instances, _SpoPageColumnListCommand_initOptions, _SpoPageColumnListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const Cli_1 = require("../../../../cli/Cli");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -40,7 +39,7 @@ class SpoPageColumnListCommand extends SpoCommand_1.default {
                 const sections = clientSidePage.sections
                     .filter(section => section.order === args.options.section);
                 if (sections.length) {
-                    const isJSONOutput = !Cli_1.Cli.shouldTrimOutput(args.options.output);
+                    const isJSONOutput = args.options.output === 'json';
                     logger.log(sections[0].columns.map(c => {
                         const column = Page_1.Page.getColumnsInformation(c, isJSONOutput);
                         column.controls = c.controls.length;

package/dist/m365/spo/commands/page/page-section-get.js

@@ -15,7 +15,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoPageSectionGetCommand_instances, _SpoPageSectionGetCommand_initOptions, _SpoPageSectionGetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const Cli_1 = require("../../../../cli/Cli");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -39,7 +38,7 @@ class SpoPageSectionGetCommand extends SpoCommand_1.default {
                 const clientSidePage = yield Page_1.Page.getPage(args.options.pageName, args.options.webUrl, logger, this.debug, this.verbose);
                 const sections = clientSidePage.sections
                     .filter(section => section.order === args.options.section);
-                const isJSONOutput = !Cli_1.Cli.shouldTrimOutput(args.options.output);
+                const isJSONOutput = args.options.output === 'json';
                 if (sections.length) {
                     logger.log(Page_1.Page.getSectionInformation(sections[0], isJSONOutput));
                 }

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

@@ -15,7 +15,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoPageSectionListCommand_instances, _SpoPageSectionListCommand_initOptions, _SpoPageSectionListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const Cli_1 = require("../../../../cli/Cli");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -38,7 +37,7 @@ class SpoPageSectionListCommand extends SpoCommand_1.default {
             try {
                 const clientSidePage = yield Page_1.Page.getPage(args.options.pageName, args.options.webUrl, logger, this.debug, this.verbose);
                 const sections = clientSidePage.sections;
-                const isJSONOutput = !Cli_1.Cli.shouldTrimOutput(args.options.output);
+                const isJSONOutput = args.options.output === 'json';
                 if (sections.length) {
                     const output = sections.map(section => Page_1.Page.getSectionInformation(section, isJSONOutput));
                     if (isJSONOutput) {

package/dist/m365/spo/commands/spo-search.js

@@ -16,7 +16,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSearchCommand_instances, _SpoSearchCommand_initTelemetry, _SpoSearchCommand_initOptions, _SpoSearchCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const util_1 = require("util");
-const Cli_1 = require("../../../cli/Cli");
 const request_1 = require("../../../request");
 const formatting_1 = require("../../../utils/formatting");
 const spo_1 = require("../../../utils/spo");
@@ -138,7 +137,7 @@ class SpoSearchCommand extends SpoCommand_1.default {
         else {
             logger.log(this.getParsedOutput(args, results));
         }
-        if (!args.options.output || Cli_1.Cli.shouldTrimOutput(args.options.output)) {
+        if (!args.options.output || args.options.output === 'text') {
             logger.log("# Rows: " + results[results.length - 1].PrimaryQueryResult.RelevantResults.TotalRows);
             logger.log("# Rows (Including duplicates): " + results[results.length - 1].PrimaryQueryResult.RelevantResults.TotalRowsIncludingDuplicates);
             logger.log("Elapsed Time: " + this.getElapsedTime(results));

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

@@ -15,7 +15,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoTermListCommand_instances, _SpoTermListCommand_initTelemetry, _SpoTermListCommand_initOptions, _SpoTermListCommand_initValidators, _SpoTermListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const Cli_1 = require("../../../../cli/Cli");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
@@ -63,7 +62,7 @@ class SpoTermListCommand extends SpoCommand_1.default {
                         }
                     }
                 }
-                if (!args.options.output || !Cli_1.Cli.shouldTrimOutput(args.options.output)) {
+                if (!args.options.output || args.options.output === 'json') {
                     logger.log(terms);
                 }
                 else if (!args.options.includeChildTerms) {

package/dist/m365/spo/commands/userprofile/userprofile-get.js

@@ -15,7 +15,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoUserProfileGetCommand_instances, _SpoUserProfileGetCommand_initOptions, _SpoUserProfileGetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
 const spo_1 = require("../../../../utils/spo");
@@ -48,7 +47,8 @@ class SpoUserProfileGetCommand extends SpoCommand_1.default {
                     responseType: 'json'
                 };
                 const res = yield request_1.default.get(requestOptions);
-                if (!args.options.output || Cli_1.Cli.shouldTrimOutput(args.options.output)) {
+                if (!args.options.output ||
+                    args.options.output === 'text') {
                     res.UserProfileProperties = JSON.stringify(res.UserProfileProperties);
                 }
                 logger.log(res);

package/dist/m365/teams/commands/meeting/meeting-list.js

@@ -79,7 +79,7 @@ class TeamsMeetingListCommand extends GraphCommand_1.default {
                 }
                 const res = yield odata_1.odata.getAllItems(requestUrl);
                 const resFiltered = res.filter(y => y.isOnlineMeeting);
-                if (!args.options.output || !Cli_1.Cli.shouldTrimOutput(args.options.output)) {
+                if (!args.options.output || args.options.output === 'json') {
                     logger.log(resFiltered);
                 }
                 else {

package/dist/m365/teams/commands/team/team-app-list.js

@@ -47,7 +47,7 @@ class TeamsTeamAppListCommand extends GraphCommand_1.default {
                 }
                 const teamId = yield this.getTeamId(args);
                 const res = yield odata_1.odata.getAllItems(`${this.resource}/v1.0/teams/${teamId}/installedApps?$expand=teamsApp,teamsAppDefinition`);
-                if (!Cli_1.Cli.shouldTrimOutput(args.options.output)) {
+                if (args.options.output === 'json') {
                     logger.log(res);
                 }
                 else {

package/dist/m365/teams/commands/user/user-app-list.js

@@ -15,7 +15,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsUserAppListCommand_instances, _TeamsUserAppListCommand_initTelemetry, _TeamsUserAppListCommand_initOptions, _TeamsUserAppListCommand_initValidators, _TeamsUserAppListCommand_initOptionSets;
 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");
@@ -48,7 +47,7 @@ class TeamsUserAppListCommand extends GraphCommand_1.default {
                     const appId = userAppId.substr(userAppId.indexOf("##") + 2, userAppId.length - userId.length - 2);
                     i.appId = appId;
                 });
-                if (!Cli_1.Cli.shouldTrimOutput(args.options.output)) {
+                if (args.options.output === 'json') {
                     logger.log(items);
                 }
                 else {

package/dist/m365/todo/commands/task/task-get.js

@@ -15,7 +15,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TodoTaskGetCommand_instances, _TodoTaskGetCommand_initTelemetry, _TodoTaskGetCommand_initOptions, _TodoTaskGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -68,7 +67,7 @@ class TodoTaskGetCommand extends GraphCommand_1.default {
                     responseType: 'json'
                 };
                 const item = yield request_1.default.get(requestOptions);
-                if (!Cli_1.Cli.shouldTrimOutput(args.options.output)) {
+                if (args.options.output === 'json') {
                     logger.log(item);
                 }
                 else {

package/dist/m365/todo/commands/task/task-list.js

@@ -15,7 +15,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TodoTaskListCommand_instances, _TodoTaskListCommand_initTelemetry, _TodoTaskListCommand_initOptions, _TodoTaskListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const odata_1 = require("../../../../utils/odata");
 const GraphCommand_1 = require("../../../base/GraphCommand");
@@ -63,7 +62,7 @@ class TodoTaskListCommand extends GraphCommand_1.default {
                 const listId = yield this.getTodoListId(args);
                 const endpoint = `${this.resource}/v1.0/me/todo/lists/${listId}/tasks`;
                 const items = yield odata_1.odata.getAllItems(endpoint);
-                if (!Cli_1.Cli.shouldTrimOutput(args.options.output)) {
+                if (args.options.output === 'json') {
                     logger.log(items);
                 }
                 else {

package/dist/m365/yammer/commands/yammer-search.js

@@ -15,7 +15,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _YammerSearchCommand_instances, _YammerSearchCommand_initTelemetry, _YammerSearchCommand_initOptions, _YammerSearchCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const Cli_1 = require("../../../cli/Cli");
 const request_1 = require("../../../request");
 const formatting_1 = require("../../../utils/formatting");
 const YammerCommand_1 = require("../../base/YammerCommand");
@@ -130,7 +129,7 @@ class YammerSearchCommand extends YammerCommand_1.default {
             this.users = [];
             try {
                 yield this.getAllItems(logger, args, 1);
-                if (!Cli_1.Cli.shouldTrimOutput(args.options.output)) {
+                if (args.options.output === 'json') {
                     logger.log({
                         summary: this.summary,
                         messages: this.messages,

package/docs/docs/cmd/spo/navigation/navigation-node-add.md

@@ -35,7 +35,7 @@ m365 spo navigation node add [options]
 
 ## Remarks
 
-To enable/disable audience targeting for the navigation bar, use the [`spo web set`](../web/web-set.md) command.
+In order to use option `audienceIds`, make sure that audience targeted navigation is enabled using command [spo web set](../web/web-set.md).
 
 ## Examples
 

package/docs/docs/cmd/spo/navigation/navigation-node-set.md

@@ -32,7 +32,7 @@ m365 spo navigation node set [options]
 
 ## Remarks
 
-To enable/disable audience targeting for the navigation bar, use the [`spo web set`](../web/web-set.md) command.
+To enable/disable audience targeting for the nsavigation bar, use command [`spo web set`](../web/web-set.md).
 
 ## Examples
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnp/cli-microsoft365",
-  "version": "6.3.0-beta.a991329",
+  "version": "6.3.0-beta.e46ffee",
   "description": "Manage Microsoft 365 and SharePoint Framework projects on any platform",
   "license": "MIT",
   "main": "./dist/api.js",