@pnp/cli-microsoft365 6.3.0-beta.3f7129c → 6.3.0-beta.64eb7da

package/dist/m365/purview/commands/auditlog/auditlog-list.js

@@ -0,0 +1,205 @@
+"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 _PurviewAuditLogListCommand_instances, _PurviewAuditLogListCommand_initTelemetry, _PurviewAuditLogListCommand_initOptions, _PurviewAuditLogListCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const Auth_1 = require("../../../../Auth");
+const request_1 = require("../../../../request");
+const accessToken_1 = require("../../../../utils/accessToken");
+const validation_1 = require("../../../../utils/validation");
+const O365MgmtCommand_1 = require("../../../base/O365MgmtCommand");
+const commands_1 = require("../../commands");
+class PurviewAuditLogListCommand extends O365MgmtCommand_1.default {
+    get name() {
+        return commands_1.default.AUDITLOG_LIST;
+    }
+    get description() {
+        return 'List audit logs within your tenant';
+    }
+    defaultProperties() {
+        return ['CreationTime', 'UserId', 'Operation', 'ObjectId'];
+    }
+    constructor() {
+        super();
+        _PurviewAuditLogListCommand_instances.add(this);
+        this.contentTypeOptions = ['AzureActiveDirectory', 'Exchange', 'SharePoint', 'General', 'DLP'];
+        __classPrivateFieldGet(this, _PurviewAuditLogListCommand_instances, "m", _PurviewAuditLogListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _PurviewAuditLogListCommand_instances, "m", _PurviewAuditLogListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _PurviewAuditLogListCommand_instances, "m", _PurviewAuditLogListCommand_initValidators).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            // If we don't create a now object, start and end date can be an few extra ms apart due to execution time between code lines
+            const now = new Date();
+            try {
+                let startTime;
+                if (args.options.startTime) {
+                    startTime = new Date(args.options.startTime);
+                }
+                else {
+                    startTime = new Date(now);
+                    startTime.setDate(startTime.getDate() - 1);
+                }
+                const endTime = args.options.endTime ? new Date(args.options.endTime) : new Date(now);
+                if (this.verbose) {
+                    logger.logToStderr(`Getting audit logs for content type '${args.options.contentType}' within a time frame from '${startTime.toISOString()}' to '${endTime.toISOString()}'.`);
+                }
+                const tenantId = accessToken_1.accessToken.getTenantIdFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken);
+                const contentTypeValue = args.options.contentType === 'DLP' ? 'DLP.All' : 'Audit.' + args.options.contentType;
+                yield this.ensureSubscription(tenantId, contentTypeValue);
+                if (this.verbose) {
+                    logger.logToStderr(`'${args.options.contentType}' subscription is active.`);
+                }
+                const contentUris = [];
+                for (const time = startTime; time < endTime; time.setDate(time.getDate() + 1)) {
+                    const differenceInMs = endTime.getTime() - time.getTime();
+                    const endTimeBatch = new Date(time.getTime() + Math.min(differenceInMs, 1000 * 60 * 60 * 24)); // ms difference cannot be greater than 1 day
+                    if (this.verbose) {
+                        logger.logToStderr(`Get content URIs for date range from '${time.toISOString()}' to '${endTimeBatch.toISOString()}'.`);
+                    }
+                    const contentUrisBatch = yield this.getContentUris(tenantId, contentTypeValue, time, endTimeBatch);
+                    contentUris.push(...contentUrisBatch);
+                }
+                if (this.verbose) {
+                    logger.logToStderr(`Get content from ${contentUris.length} content URIs.`);
+                }
+                const logs = yield this.getContent(logger, contentUris);
+                const sortedLogs = logs.sort(this.auditLogsCompare);
+                logger.log(sortedLogs);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    ensureSubscription(tenantId, contentType) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${this.resource}/api/v1.0/${tenantId}/activity/feed/subscriptions/list`,
+                headers: {
+                    accept: 'application/json'
+                },
+                responseType: 'json'
+            };
+            const subscriptions = yield request_1.default.get(requestOptions);
+            if (subscriptions.some(s => s.contentType === contentType && s.status === 'enabled')) {
+                return;
+            }
+            requestOptions.url = `${this.resource}/api/v1.0/${tenantId}/activity/feed/subscriptions/start?contentType=${contentType}`;
+            const subscription = yield request_1.default.post(requestOptions);
+            if (subscription.status !== 'enabled') {
+                throw `Unable to start subscription '${contentType}'`;
+            }
+        });
+    }
+    getContentUris(tenantId, contentType, startTime, endTime) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const contentUris = [];
+            const requestOptions = {
+                url: `${this.resource}/api/v1.0/${tenantId}/activity/feed/subscriptions/content?contentType=${contentType}&startTime=${startTime.toISOString()}&endTime=${endTime.toISOString()}`,
+                headers: {
+                    accept: 'application/json'
+                },
+                responseType: 'json',
+                fullResponse: true
+            };
+            do {
+                const response = yield request_1.default.get(requestOptions);
+                const uris = response.data.map(d => d.contentUri);
+                contentUris.push(...uris);
+                requestOptions.url = response.headers.nextpageuri;
+            } while (requestOptions.url);
+            return contentUris;
+        });
+    }
+    getContent(logger, contentUris) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const logs = [];
+            const batchSize = 30;
+            for (let i = 0; i < contentUris.length; i += batchSize) {
+                const contentUrisBatch = contentUris.slice(i, i + batchSize);
+                if (this.verbose) {
+                    logger.logToStderr(`Retrieving content from next ${contentUrisBatch.length} content URIs. Progress: ${Math.round(i / contentUris.length * 100)}%`);
+                }
+                const batchResult = yield Promise.all(contentUrisBatch.map(uri => request_1.default.get({
+                    url: uri,
+                    headers: {
+                        accept: 'application/json'
+                    },
+                    responseType: 'json'
+                })));
+                batchResult.forEach(res => logs.push(...res));
+            }
+            return logs;
+        });
+    }
+    auditLogsCompare(a, b) {
+        if (a.CreationTime < b.CreationTime) {
+            return -1;
+        }
+        if (a.CreationTime > b.CreationTime) {
+            return 1;
+        }
+        return 0;
+    }
+}
+_PurviewAuditLogListCommand_instances = new WeakSet(), _PurviewAuditLogListCommand_initTelemetry = function _PurviewAuditLogListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            startTime: typeof args.options.startTime !== 'undefined',
+            endTime: typeof args.options.endTime !== 'undefined'
+        });
+    });
+}, _PurviewAuditLogListCommand_initOptions = function _PurviewAuditLogListCommand_initOptions() {
+    this.options.unshift({
+        option: '--contentType <contentType>',
+        autocomplete: this.contentTypeOptions
+    }, {
+        option: '--startTime [startTime]'
+    }, {
+        option: '--endTime [endTime]'
+    });
+}, _PurviewAuditLogListCommand_initValidators = function _PurviewAuditLogListCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (this.contentTypeOptions.indexOf(args.options.contentType) === -1) {
+            return `'${args.options.contentType}' is not a valid contentType value. Allowed values: ${this.contentTypeOptions}.`;
+        }
+        if (args.options.startTime) {
+            if (!validation_1.validation.isValidISODateTime(args.options.startTime)) {
+                return `'${args.options.startTime}' is not a valid ISO date time string.`;
+            }
+            const lowerDateLimit = new Date();
+            lowerDateLimit.setDate(lowerDateLimit.getDate() - 7);
+            lowerDateLimit.setHours(lowerDateLimit.getHours() - 1); // Min date is 7 days ago, however there seems to be an 1h margin
+            if (new Date(args.options.startTime) < lowerDateLimit) {
+                return 'startTime value cannot be more than 7 days in the past.';
+            }
+        }
+        if (args.options.endTime) {
+            if (!validation_1.validation.isValidISODateTime(args.options.endTime)) {
+                return `'${args.options.endTime}' is not a valid ISO date time string.`;
+            }
+            if (new Date(args.options.endTime) > new Date()) {
+                return 'endTime value cannot be in the future.';
+            }
+        }
+        if (args.options.startTime && args.options.endTime && new Date(args.options.startTime) >= new Date(args.options.endTime)) {
+            return 'startTime value must be before endTime.';
+        }
+        return true;
+    }));
+};
+module.exports = new PurviewAuditLogListCommand();
+//# sourceMappingURL=auditlog-list.js.map

package/dist/m365/purview/commands/retentioneventtype/retentioneventtype-get.js

@@ -0,0 +1,70 @@
+"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 _PurviewRetentionEventtypeGetCommand_instances, _PurviewRetentionEventtypeGetCommand_initOptions, _PurviewRetentionEventtypeGetCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+const request_1 = require("../../../../request");
+const validation_1 = require("../../../../utils/validation");
+class PurviewRetentionEventtypeGetCommand extends GraphCommand_1.default {
+    get name() {
+        return commands_1.default.RETENTIONEVENTTYPE_GET;
+    }
+    get description() {
+        return 'Retrieve the specified retention event type';
+    }
+    constructor() {
+        super();
+        _PurviewRetentionEventtypeGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PurviewRetentionEventtypeGetCommand_instances, "m", _PurviewRetentionEventtypeGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _PurviewRetentionEventtypeGetCommand_instances, "m", _PurviewRetentionEventtypeGetCommand_initValidators).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                if (this.verbose) {
+                    logger.logToStderr(`Retrieving retention event type with id ${args.options.id}`);
+                }
+                const requestOptions = {
+                    url: `${this.resource}/beta/security/triggerTypes/retentionEventTypes/${args.options.id}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json'
+                };
+                const res = yield request_1.default.get(requestOptions);
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+}
+_PurviewRetentionEventtypeGetCommand_instances = new WeakSet(), _PurviewRetentionEventtypeGetCommand_initOptions = function _PurviewRetentionEventtypeGetCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --id <id>'
+    });
+}, _PurviewRetentionEventtypeGetCommand_initValidators = function _PurviewRetentionEventtypeGetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (!validation_1.validation.isValidGuid(args.options.id)) {
+            return `'${args.options.id}' is not a valid GUID.`;
+        }
+        return true;
+    }));
+};
+module.exports = new PurviewRetentionEventtypeGetCommand();
+//# sourceMappingURL=retentioneventtype-get.js.map

package/dist/m365/purview/commands.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const prefix = 'purview';
 exports.default = {
+    RETENTIONEVENTTYPE_GET: `${prefix} retentioneventtype get`,
+    AUDITLOG_LIST: `${prefix} auditlog list`,
     RETENTIONLABEL_ADD: `${prefix} retentionlabel add`,
     RETENTIONLABEL_GET: `${prefix} retentionlabel get`,
     RETENTIONLABEL_LIST: `${prefix} retentionlabel list`,

package/dist/m365/spfx/commands/project/WebApiPermissionRequests.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=WebApiPermissionRequests.js.map

package/dist/m365/spfx/commands/project/project-permissions-grant.js

@@ -0,0 +1,81 @@
+"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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const path = require("path");
+const fs = require("fs");
+const Command_1 = require("../../../../Command");
+const commands_1 = require("../../commands");
+const base_project_command_1 = require("./base-project-command");
+const SpoServicePrincipalGrantAddCommand = require("../../../spo/commands/serviceprincipal/serviceprincipal-grant-add");
+const Cli_1 = require("../../../../cli/Cli");
+class SpfxProjectPermissionSGrantCommand extends base_project_command_1.BaseProjectCommand {
+    get name() {
+        return commands_1.default.PROJECT_PERMISSIONS_GRANT;
+    }
+    get description() {
+        return 'Grant API permissions defined in the current SPFx project';
+    }
+    constructor() {
+        super();
+    }
+    commandAction(logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.projectRootPath = this.getProjectRoot(process.cwd());
+            if (this.projectRootPath === null) {
+                throw new Command_1.CommandError(`Couldn't find project root folder`, SpfxProjectPermissionSGrantCommand.ERROR_NO_PROJECT_ROOT_FOLDER);
+            }
+            if (this.debug) {
+                logger.logToStderr(`Granting API permissions defined in the current SPFx project`);
+            }
+            try {
+                const webApiPermissionsRequest = this.getWebApiPermissionRequest(path.join(this.projectRootPath, 'config', 'package-solution.json'));
+                for (const permission of webApiPermissionsRequest) {
+                    const options = {
+                        resource: permission.resource,
+                        scope: permission.scope,
+                        output: 'json',
+                        debug: this.debug,
+                        verbose: this.verbose
+                    };
+                    let output = null;
+                    try {
+                        output = yield Cli_1.Cli.executeCommandWithOutput(SpoServicePrincipalGrantAddCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
+                    }
+                    catch (err) {
+                        if (err.error && err.error.message.indexOf('already exists') > -1) {
+                            this.warn(logger, err.error.message);
+                            continue;
+                        }
+                        else {
+                            throw err;
+                        }
+                    }
+                    const getGrantOutput = JSON.parse(output.stdout);
+                    logger.log(getGrantOutput);
+                }
+            }
+            catch (error) {
+                throw new Command_1.CommandError(error);
+            }
+        });
+    }
+    getWebApiPermissionRequest(filePath) {
+        if (!fs.existsSync(filePath)) {
+            throw (`The package-solution.json file could not be found`);
+        }
+        const existingContent = fs.readFileSync(filePath, 'utf-8');
+        const solutionContent = JSON.parse(existingContent);
+        return solutionContent.solution.webApiPermissionRequests;
+    }
+}
+SpfxProjectPermissionSGrantCommand.ERROR_NO_PROJECT_ROOT_FOLDER = 1;
+module.exports = new SpfxProjectPermissionSGrantCommand();
+//# sourceMappingURL=project-permissions-grant.js.map

package/dist/m365/spfx/commands.js

@@ -5,8 +5,9 @@ exports.default = {
     DOCTOR: `${prefix} doctor`,
     PACKAGE_GENERATE: `${prefix} package generate`,
     PROJECT_DOCTOR: `${prefix} project doctor`,
-    PROJECT_UPGRADE: `${prefix} project upgrade`,
     PROJECT_EXTERNALIZE: `${prefix} project externalize`,
-    PROJECT_RENAME: `${prefix} project rename`
+    PROJECT_PERMISSIONS_GRANT: `${prefix} project permissions grant`,
+    PROJECT_RENAME: `${prefix} project rename`,
+    PROJECT_UPGRADE: `${prefix} project upgrade`
 };
 //# sourceMappingURL=commands.js.map

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

@@ -17,6 +17,7 @@ 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");
@@ -58,7 +59,7 @@ class SpoAppAddCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
                 };
                 const res = yield request_1.default.post(requestOptions);
                 const json = JSON.parse(res);
-                if (args.options.output === 'json') {
+                if (!Cli_1.Cli.shouldTrimOutput(args.options.output)) {
                     logger.log(json);
                 }
                 else {

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

@@ -15,6 +15,7 @@ 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");
@@ -60,7 +61,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 (args.options.output === 'json') {
+                if (!Cli_1.Cli.shouldTrimOutput(args.options.output)) {
                     logger.log(res);
                 }
                 else {

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

@@ -15,6 +15,7 @@ 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");
@@ -51,7 +52,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 || args.options.output === 'json' || args.options.output === 'md') {
+                if (!args.options.output || !Cli_1.Cli.shouldTrimOutput(args.options.output)) {
                     logger.log(sharingLinks);
                 }
                 else {

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

@@ -15,6 +15,7 @@ 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");
@@ -73,7 +74,7 @@ class SpoGroupListCommand extends SpoCommand_1.default {
             };
             const groupProperties = yield request_1.default.get(requestOptions);
             logger.log(groupProperties);
-            if (!options.output || options.output === 'json') {
+            if (!options.output || !Cli_1.Cli.shouldTrimOutput(options.output)) {
                 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 && args.options.output === 'json') {
+                if (args.options.includeAssociatedSites === true && args.options.output && !Cli_1.Cli.shouldTrimOutput(args.options.output)) {
                     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,6 +15,7 @@ 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");
@@ -53,7 +54,7 @@ class SpoListItemListCommand extends SpoCommand_1.default {
             }
             let formDigestValue = '';
             const fieldsArray = args.options.fields ? args.options.fields.split(",")
-                : (!args.options.output || args.options.output === "text") ? ["Title", "Id"] : [];
+                : (!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);

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

@@ -15,6 +15,7 @@ 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");
@@ -39,7 +40,7 @@ class SpoPageColumnGetCommand extends SpoCommand_1.default {
                 const sections = clientSidePage.sections
                     .filter(section => section.order === args.options.section);
                 if (sections.length) {
-                    const isJSONOutput = args.options.output === 'json';
+                    const isJSONOutput = !Cli_1.Cli.shouldTrimOutput(args.options.output);
                     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,6 +15,7 @@ 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");
@@ -39,7 +40,7 @@ class SpoPageColumnListCommand extends SpoCommand_1.default {
                 const sections = clientSidePage.sections
                     .filter(section => section.order === args.options.section);
                 if (sections.length) {
-                    const isJSONOutput = args.options.output === 'json';
+                    const isJSONOutput = !Cli_1.Cli.shouldTrimOutput(args.options.output);
                     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,6 +15,7 @@ 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");
@@ -38,7 +39,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 = args.options.output === 'json';
+                const isJSONOutput = !Cli_1.Cli.shouldTrimOutput(args.options.output);
                 if (sections.length) {
                     logger.log(Page_1.Page.getSectionInformation(sections[0], isJSONOutput));
                 }

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

@@ -15,6 +15,7 @@ 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");
@@ -37,7 +38,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 = args.options.output === 'json';
+                const isJSONOutput = !Cli_1.Cli.shouldTrimOutput(args.options.output);
                 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,6 +16,7 @@ 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");
@@ -137,7 +138,7 @@ class SpoSearchCommand extends SpoCommand_1.default {
         else {
             logger.log(this.getParsedOutput(args, results));
         }
-        if (!args.options.output || args.options.output === 'text') {
+        if (!args.options.output || Cli_1.Cli.shouldTrimOutput(args.options.output)) {
             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,6 +15,7 @@ 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");
@@ -62,7 +63,7 @@ class SpoTermListCommand extends SpoCommand_1.default {
                         }
                     }
                 }
-                if (!args.options.output || args.options.output === 'json') {
+                if (!args.options.output || !Cli_1.Cli.shouldTrimOutput(args.options.output)) {
                     logger.log(terms);
                 }
                 else if (!args.options.includeChildTerms) {

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

@@ -15,6 +15,7 @@ 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");
@@ -47,8 +48,7 @@ class SpoUserProfileGetCommand extends SpoCommand_1.default {
                     responseType: 'json'
                 };
                 const res = yield request_1.default.get(requestOptions);
-                if (!args.options.output ||
-                    args.options.output === 'text') {
+                if (!args.options.output || Cli_1.Cli.shouldTrimOutput(args.options.output)) {
                     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 || args.options.output === 'json') {
+                if (!args.options.output || !Cli_1.Cli.shouldTrimOutput(args.options.output)) {
                     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 (args.options.output === 'json') {
+                if (!Cli_1.Cli.shouldTrimOutput(args.options.output)) {
                     logger.log(res);
                 }
                 else {