@pnp/cli-microsoft365 7.8.0-beta.3152fc7 → 7.8.0-beta.5ca5055

package/dist/cli/cli.js

@@ -17,6 +17,7 @@ import { md } from '../utils/md.js';
 import { validation } from '../utils/validation.js';
 import { prompt } from '../utils/prompt.js';
 import { timings } from './timings.js';
+import { browserUtil } from '../utils/browserUtil.js';
 import chalk from 'chalk';
 const require = createRequire(import.meta.url);
 const __dirname = fileURLToPath(new URL('.', import.meta.url));
@@ -35,7 +36,9 @@ let commandToExecute;
 let currentCommandName;
 let optionsFromArgs;
 const defaultHelpMode = 'options';
+const defaultHelpTarget = 'console';
 const helpModes = ['options', 'examples', 'remarks', 'response', 'full'];
+const helpTargets = ['console', 'web'];
 function getConfig() {
     if (!_config) {
         _config = new Configstore(config.configstoreName);
@@ -551,7 +554,13 @@ async function printHelp(helpMode, exitCode = 0) {
     const properties = {};
     if (cli.commandToExecute) {
         properties.command = cli.commandToExecute.name;
-        printCommandHelp(helpMode);
+        const helpTarget = getSettingWithDefaultValue(settingsNames.helpTarget, defaultHelpTarget);
+        if (helpTarget === 'web') {
+            await openHelpInBrowser();
+        }
+        else {
+            printCommandHelp(helpMode);
+        }
     }
     else {
         if (cli.currentCommandName && !cli.commands.some(command => command.name.startsWith(cli.currentCommandName))) {
@@ -567,6 +576,11 @@ async function printHelp(helpMode, exitCode = 0) {
     telemetry.trackEvent('help', properties);
     process.exit(exitCode);
 }
+async function openHelpInBrowser() {
+    const pathChunks = cli.commandToExecute.help?.replace(/\\/g, '/').replace(/\.[^/.]+$/, '');
+    const onlineUrl = `https://pnp.github.io/cli-microsoft365/cmd/${pathChunks}`;
+    await browserUtil.open(onlineUrl);
+}
 function printCommandHelp(helpMode) {
     const docsRootDir = path.join(__dirname, '..', '..', 'docs');
     const helpFilePath = path.join(docsRootDir, 'docs', 'cmd', cli.commandToExecute.help);
@@ -865,6 +879,7 @@ export const cli = {
     getSettingWithDefaultValue,
     handleMultipleResultsFound,
     helpModes,
+    helpTargets,
     loadAllCommandsInfo,
     loadCommandFromArgs,
     loadCommandFromFile,

package/dist/m365/cli/commands/config/config-set.js

@@ -87,6 +87,10 @@ _a = CliConfigSetCommand, _CliConfigSetCommand_instances = new WeakSet(), _CliCo
             allowedAuthTypes.indexOf(args.options.value) === -1) {
             return `${args.options.value} is not a valid value for the option ${args.options.key}. Allowed values: ${allowedAuthTypes.join(', ')}`;
         }
+        if (args.options.key === settingsNames.helpTarget &&
+            !cli.helpTargets.includes(args.options.value)) {
+            return `${args.options.value} is not a valid value for the option ${args.options.key}. Allowed values: ${cli.helpTargets.join(', ')}`;
+        }
         return true;
     });
 };

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

@@ -4,6 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _FlowRunListCommand_instances, _FlowRunListCommand_initTelemetry, _FlowRunListCommand_initOptions, _FlowRunListCommand_initValidators;
+import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
@@ -38,6 +39,9 @@ class FlowRunListCommand extends PowerAutomateCommand {
         }
         try {
             const items = await odata.getAllItems(url);
+            if (args.options.withTrigger) {
+                await this.retrieveTriggerInformation(items);
+            }
             if (args.options.output !== 'json' && items.length > 0) {
                 items.forEach(i => {
                     i.startTime = i.properties.startTime;
@@ -63,6 +67,21 @@ class FlowRunListCommand extends PowerAutomateCommand {
         }
         return filters;
     }
+    async retrieveTriggerInformation(items) {
+        const tasks = items.map(async (item) => {
+            const requestOptions = {
+                url: item.properties.trigger.outputsLink.uri,
+                headers: {
+                    accept: 'application/json',
+                    'x-anonymous': true
+                },
+                responseType: 'json'
+            };
+            const response = await request.get(requestOptions);
+            item.triggerInformation = response.body;
+        });
+        await Promise.all(tasks);
+    }
 }
 _FlowRunListCommand_instances = new WeakSet(), _FlowRunListCommand_initTelemetry = function _FlowRunListCommand_initTelemetry() {
     this.telemetry.push((args) => {
@@ -70,6 +89,7 @@ _FlowRunListCommand_instances = new WeakSet(), _FlowRunListCommand_initTelemetry
             status: typeof args.options.status !== 'undefined',
             triggerStartTime: typeof args.options.triggerStartTime !== 'undefined',
             triggerEndTime: typeof args.options.triggerEndTime !== 'undefined',
+            withTrigger: !!args.options.withTrigger,
             asAdmin: !!args.options.asAdmin
         });
     });
@@ -85,6 +105,8 @@ _FlowRunListCommand_instances = new WeakSet(), _FlowRunListCommand_initTelemetry
         option: '--triggerStartTime [triggerStartTime]'
     }, {
         option: '--triggerEndTime [triggerEndTime]'
+    }, {
+        option: '--withTrigger'
     }, {
         option: '--asAdmin'
     });
@@ -102,6 +124,9 @@ _FlowRunListCommand_instances = new WeakSet(), _FlowRunListCommand_initTelemetry
         if (args.options.triggerEndTime && !validation.isValidISODateTime(args.options.triggerEndTime)) {
             return `'${args.options.triggerEndTime}' is not a valid datetime.`;
         }
+        if (args.options.output !== 'json' && args.options.withTrigger) {
+            return 'The --withTrigger option is only available when output is set to json';
+        }
         return true;
     });
 };

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

@@ -4,6 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoSiteAddCommand_instances, _SpoSiteAddCommand_initTelemetry, _SpoSiteAddCommand_initOptions, _SpoSiteAddCommand_initValidators;
+import { setTimeout } from 'timers/promises';
 import config from '../../../../config.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -198,19 +199,14 @@ class SpoSiteAddCommand extends SpoCommand {
             if ((!args.options.wait && !args.options.withAppCatalog) || isComplete) {
                 return args.options.url;
             }
-            await new Promise((resolve, reject) => {
-                setTimeout(() => {
-                    spo.waitUntilFinished({
-                        operationId: JSON.stringify(operation._ObjectIdentity_),
-                        siteUrl: this.spoAdminUrl,
-                        resolve,
-                        reject,
-                        logger,
-                        currentContext: this.context,
-                        verbose: this.verbose,
-                        debug: this.debug
-                    });
-                }, operation.PollingInterval);
+            await setTimeout(operation.PollingInterval);
+            await spo.waitUntilFinished({
+                operationId: JSON.stringify(operation._ObjectIdentity_),
+                siteUrl: this.spoAdminUrl,
+                logger,
+                currentContext: this.context,
+                verbose: this.verbose,
+                debug: this.debug
             });
             return args.options.url;
         }
@@ -291,19 +287,14 @@ class SpoSiteAddCommand extends SpoCommand {
         if (!wait || isComplete) {
             return;
         }
-        await new Promise((resolve, reject) => {
-            setTimeout(() => {
-                spo.waitUntilFinished({
-                    operationId: JSON.stringify(operation._ObjectIdentity_),
-                    siteUrl: this.spoAdminUrl,
-                    resolve,
-                    reject,
-                    logger,
-                    currentContext: this.context,
-                    verbose: this.verbose,
-                    debug: this.debug
-                });
-            }, operation.PollingInterval);
+        await setTimeout(operation.PollingInterval);
+        await spo.waitUntilFinished({
+            operationId: JSON.stringify(operation._ObjectIdentity_),
+            siteUrl: this.spoAdminUrl,
+            logger,
+            currentContext: this.context,
+            verbose: this.verbose,
+            debug: this.debug
         });
     }
     async addAppCatalog(url, logger) {

package/dist/m365/spo/commands/site/site-remove.js

@@ -14,6 +14,7 @@ import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+import { setTimeout } from 'timers/promises';
 class SpoSiteRemoveCommand extends SpoCommand {
     get name() {
         return commands.SITE_REMOVE;
@@ -153,19 +154,14 @@ class SpoSiteRemoveCommand extends SpoCommand {
         if (!wait || isComplete) {
             return;
         }
-        await new Promise((resolve, reject) => {
-            setTimeout(() => {
-                spo.waitUntilFinished({
-                    operationId: JSON.stringify(operation._ObjectIdentity_),
-                    siteUrl: this.spoAdminUrl,
-                    resolve,
-                    reject,
-                    logger,
-                    currentContext: this.context,
-                    debug: this.debug,
-                    verbose: this.verbose
-                });
-            }, operation.PollingInterval);
+        await setTimeout(operation.PollingInterval);
+        await spo.waitUntilFinished({
+            operationId: JSON.stringify(operation._ObjectIdentity_),
+            siteUrl: this.spoAdminUrl,
+            logger,
+            currentContext: this.context,
+            debug: this.debug,
+            verbose: this.verbose
         });
     }
     async deleteSiteFromTheRecycleBin(url, wait, logger) {
@@ -188,19 +184,14 @@ class SpoSiteRemoveCommand extends SpoCommand {
         if (!wait || isComplete) {
             return;
         }
-        await new Promise((resolve, reject) => {
-            setTimeout(() => {
-                spo.waitUntilFinished({
-                    operationId: JSON.stringify(operation._ObjectIdentity_),
-                    siteUrl: this.spoAdminUrl,
-                    resolve,
-                    reject,
-                    logger,
-                    currentContext: this.context,
-                    debug: this.debug,
-                    verbose: this.verbose
-                });
-            }, operation.PollingInterval);
+        await setTimeout(operation.PollingInterval);
+        await spo.waitUntilFinished({
+            operationId: JSON.stringify(operation._ObjectIdentity_),
+            siteUrl: this.spoAdminUrl,
+            logger,
+            currentContext: this.context,
+            debug: this.debug,
+            verbose: this.verbose
         });
     }
     async getSiteGroupId(url, logger) {

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

@@ -18,6 +18,7 @@ import commands from '../../commands.js';
 import { SharingCapabilities } from '../site/SharingCapabilities.js';
 import spoSiteDesignApplyCommand from '../sitedesign/sitedesign-apply.js';
 import { FlowsPolicy } from './FlowsPolicy.js';
+import { setTimeout } from 'timers/promises';
 class SpoSiteSetCommand extends SpoCommand {
     get name() {
         return commands.SITE_SET;
@@ -128,19 +129,14 @@ class SpoSiteSetCommand extends SpoCommand {
         if (!args.options.wait || isComplete) {
             return;
         }
-        await new Promise((resolve, reject) => {
-            setTimeout(() => {
-                spo.waitUntilFinished({
-                    operationId: JSON.stringify(operation._ObjectIdentity_),
-                    siteUrl: this.spoAdminUrl,
-                    resolve,
-                    reject,
-                    logger,
-                    currentContext: this.context,
-                    debug: this.debug,
-                    verbose: this.verbose
-                });
-            }, operation.PollingInterval);
+        await setTimeout(operation.PollingInterval);
+        await spo.waitUntilFinished({
+            operationId: JSON.stringify(operation._ObjectIdentity_),
+            siteUrl: this.spoAdminUrl,
+            logger,
+            currentContext: this.context,
+            debug: this.debug,
+            verbose: this.verbose
         });
     }
     async updateSiteOwners(logger, args) {

package/dist/m365/spo/commands/tenant/tenant-recyclebinitem-remove.js

@@ -4,6 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoTenantRecycleBinItemRemoveCommand_instances, _SpoTenantRecycleBinItemRemoveCommand_initTelemetry, _SpoTenantRecycleBinItemRemoveCommand_initOptions, _SpoTenantRecycleBinItemRemoveCommand_initValidators;
+import { setTimeout } from 'timers/promises';
 import { cli } from '../../../../cli/cli.js';
 import config from '../../../../config.js';
 import request from '../../../../request.js';
@@ -62,19 +63,14 @@ class SpoTenantRecycleBinItemRemoveCommand extends SpoCommand {
             if (!args.options.wait || isComplete) {
                 return;
             }
-            await new Promise((resolve, reject) => {
-                setTimeout(() => {
-                    spo.waitUntilFinished({
-                        operationId: JSON.stringify(operation._ObjectIdentity_),
-                        siteUrl: spoAdminUrl,
-                        resolve,
-                        reject,
-                        logger,
-                        currentContext: this.context,
-                        debug: this.debug,
-                        verbose: this.verbose
-                    });
-                }, operation.PollingInterval);
+            await setTimeout(operation.PollingInterval);
+            await spo.waitUntilFinished({
+                operationId: JSON.stringify(operation._ObjectIdentity_),
+                siteUrl: spoAdminUrl,
+                logger,
+                currentContext: this.context,
+                debug: this.debug,
+                verbose: this.verbose
             });
         }
         catch (err) {

package/dist/settingsNames.js

@@ -10,6 +10,7 @@ const settingsNames = {
     disableTelemetry: 'disableTelemetry',
     errorOutput: 'errorOutput',
     helpMode: 'helpMode',
+    helpTarget: 'helpTarget',
     output: 'output',
     printErrorsAsPlainText: 'printErrorsAsPlainText',
     prompt: 'prompt',